diff --git a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/.suo b/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/.suo index 6cbc173..85eb7ab 100644 Binary files a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/.suo and b/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/.suo differ diff --git a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide b/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide index 56758a8..ba6598e 100644 Binary files a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide and b/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide differ diff --git a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide-shm b/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide-shm deleted file mode 100644 index 12f3be4..0000000 Binary files a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide-shm and /dev/null differ diff --git a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide-wal b/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide-wal deleted file mode 100644 index c20ad93..0000000 Binary files a/IngeniBridge.Programs/.vs/IngeniBridge.Programs/v15/Server/sqlite3/storage.ide-wal and /dev/null differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj index cbf9694..da279da 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj @@ -45,19 +45,18 @@ ..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll - - ..\packages\IngeniBridge.Core.1.0.33\lib\net461\IngeniBridge.Core.dll + + ..\packages\IngeniBridge.Core.1.0.36\lib\net461\IngeniBridge.Core.dll - - ..\packages\IngeniBridge.StorageAccessor.InMemory.1.0.3\lib\net461\IngeniBridge.StorageAccessor.InMemory.dll + + ..\packages\IngeniBridge.StorageAccessor.InMemory.1.0.6\lib\net461\IngeniBridge.StorageAccessor.InMemory.dll ..\packages\IngeniBridge.Utils.1.0.3\lib\net452\IngeniBridge.Utils.dll True - - ..\packages\JT.TechCases.Threading.1.0.10\lib\net452\JT.TechCases.Threading.dll - True + + ..\packages\JT.TechCases.Threading.1.0.11\lib\net45\JT.TechCases.Threading.dll ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/LaunchOnMyCompanyDb.cmd b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/LaunchOnMyCompanyDb.cmd index a36f401..1d866b6 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/LaunchOnMyCompanyDb.cmd +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/LaunchOnMyCompanyDb.cmd @@ -1,3 +1,3 @@ rem dont forget to rename ibdb file in the command line -bin\Release\IngeniBridge.GenerateFullInventory --StorageAccessorAssembly="IngeniBridge.StorageAccessor.InMemory.dll" --IBDatabase=..\..\IngeniBridge.Sample.MyCompany\IngeniBridge.Samples.MyCompany\MasterAssetMyCompany_2018_06_23.ibdb --InventoryFile=InventoryFileIB.xlsx +bin\Release\IngeniBridge.GenerateFullInventory --StorageAccessorAssembly="IngeniBridge.StorageAccessor.InMemory.dll" --IBDatabase=..\..\IngeniBridge.Sample.MyCompany\IngeniBridge.Samples.MyCompany\MasterAssetMyCompany_2018_08_25.ibdb --InventoryFile=InventoryFileIB.xlsx pause diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.dll b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.dll index 50719c5..3e8448a 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.dll and b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.xml b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.xml index 6bb120c..b8046c3 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.xml +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.Core.xml @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.exe b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.exe index 98ef46a..094ca5d 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.exe and b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.exe differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.log b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.log index c9b8615..c62cc02 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.log +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.log @@ -57,3 +57,13 @@ Nom de fichier 2018-06-23 08:02:58,841;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;DataModel Version Minor => 0 2018-06-23 08:02:58,841;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;DataModel Version Build => 8 2018-06-23 08:02:59,442;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;Terminé OK. +2018-08-25 06:50:22,879;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;Starting IngeniBridge.GenerateFullInventory v1.0.0.12104 +2018-08-25 06:50:22,894;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;StorageAccessorAssembly => IngeniBridge.StorageAccessor.InMemory.dll +2018-08-25 06:50:22,894;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;IBDatabase => ..\..\IngeniBridge.Sample.MyCompany\IngeniBridge.Samples.MyCompany\MasterAssetMyCompany_2018_08_25.ibdb +2018-08-25 06:50:22,894;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;InventoryFile => InventoryFileIB.xlsx +2018-08-25 06:50:23,167;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;DataModel Name => MyCompanyDataModel +2018-08-25 06:50:23,169;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;DataModel Date => 25/08/2018 06:38:25 +2018-08-25 06:50:23,169;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;DataModel Version Majour => 1 +2018-08-25 06:50:23,169;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;DataModel Version Minor => 0 +2018-08-25 06:50:23,169;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;DataModel Version Build => 8 +2018-08-25 06:50:23,630;[1];INFO ;IngeniBridge.GenerateFullInventory.Program;Terminé OK. diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.pdb b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.pdb index e7ab7e0..23c3856 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.pdb and b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.GenerateFullInventory.pdb differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll index 763a322..f1780f7 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll and b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.dll b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.dll index 13843b6..a5b38cc 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.dll and b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.dll differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.xml b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.xml index e908e45..de092d6 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.xml +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/bin/Release/JT.TechCases.Threading.xml @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache index fbdf2bf..437be1a 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1fc3f37ad3fd1b4dd00cadefc00a15f65217e84b +2c7d51e409a2b18a6e6a140bacb805ae0dc5bd35 diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache index b87a1e9..226a12f 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache and b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Debug/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache index 6e75b51..366a4a6 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -11b8a0cf12834f5f8133dadebf86451724603b09 +4829aa502d1643e49e41301c4c204ed62b473f03 diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache index 7832414..84d76f9 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache and b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/obj/Release/IngeniBridge.GenerateFullInventory.csprojAssemblyReference.cache differ diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/packages.config b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/packages.config index 0d9690a..80794af 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/packages.config +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/packages.config @@ -2,10 +2,10 @@ - - + + - + diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj index 025db6e..05ce9af 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj @@ -40,15 +40,14 @@ ..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll - - ..\packages\IngeniBridge.Core.1.0.33\lib\net461\IngeniBridge.Core.dll + + ..\packages\IngeniBridge.Core.1.0.36\lib\net461\IngeniBridge.Core.dll - - ..\packages\IngeniBridge.StorageAccessor.InMemory.1.0.3\lib\net461\IngeniBridge.StorageAccessor.InMemory.dll + + ..\packages\IngeniBridge.StorageAccessor.InMemory.1.0.6\lib\net461\IngeniBridge.StorageAccessor.InMemory.dll - - ..\packages\JT.TechCases.Threading.1.0.10\lib\net452\JT.TechCases.Threading.dll - True + + ..\packages\JT.TechCases.Threading.1.0.11\lib\net45\JT.TechCases.Threading.dll ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/LaunchOnMyCompanyDb.cmd b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/LaunchOnMyCompanyDb.cmd index 9561f66..3848c6e 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/LaunchOnMyCompanyDb.cmd +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/LaunchOnMyCompanyDb.cmd @@ -1,3 +1,3 @@ rem dont forget to rename ibdb file in the command line -bin\Release\IngeniBridge.IBDatabaseParser --StorageAccessorAssembly="IngeniBridge.StorageAccessor.InMemory.dll" --IBDatabase=..\..\IngeniBridge.Sample.MyCompany\IngeniBridge.Samples.MyCompany\MasterAssetMyCompany_2018_06_23.ibdb +bin\Release\IngeniBridge.IBDatabaseParser --StorageAccessorAssembly="IngeniBridge.StorageAccessor.InMemory.dll" --IBDatabase=..\..\IngeniBridge.Sample.MyCompany\IngeniBridge.Samples.MyCompany\MasterAssetMyCompany_2018_08_25.ibdb pause \ No newline at end of file diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Program.cs b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Program.cs index fd4f4fc..f0db8d7 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Program.cs +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Program.cs @@ -50,12 +50,12 @@ static int Main ( string [] args ) TreeChecker tc = new TreeChecker ( accessor ); Console.WriteLine ( "VĂ©rification de l'arbre..." ); tc.CheckTree ( true, message => log.Error ( message ) ); - accessor.IterateTree ( accessor.RootAsset, ( inode ) => + accessor.IterateTree ( accessor.RootAsset.Entity, ( inode ) => { - Console.WriteLine ( "Tree pos => " + inode.FlatPath ); - Console.WriteLine ( "Parent attribute containing node => " + inode.NodeParentAttribute ); - Console.WriteLine ( "\tObject => " + inode.vemdNode.EntityType.Name + " - " + accessor.MetaHelper.RetrieveCodeValue ( inode.Node ) + " - " + accessor.MetaHelper.RetrieveLabelValue ( inode.Node ) ); - accessor.MetaHelper.ParseAttributes ( inode.Node, ( attribute, val ) => + Console.WriteLine ( "Tree pos => " + inode.NodePath ); + Console.WriteLine ( "Parent attribute containing node => " + inode.AttributeInParent ); + Console.WriteLine ( "\tObject => " + inode.Entity.GetType () .Name + " - " + accessor.ContentHelper.RetrieveCodeValue ( inode.Entity ) + " - " + accessor.ContentHelper.RetrieveLabelValue ( inode.Entity ) ); + accessor.ContentHelper.ParseAttributes ( inode.Entity, ( attribute, val ) => { Console.WriteLine ( "\t\tAttribute => " + attribute.AttributeName + " (" + attribute.AttributeType.Name + ") = " + val.ToString () ); return ( true ); diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.dll b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.dll index 50719c5..3e8448a 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.dll and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.xml b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.xml index 6bb120c..b8046c3 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.xml +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.Core.xml @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.exe b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.exe index d80aedb..863774b 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.exe and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.exe differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.log b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.log index f65b632..f4b6cfd 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.log +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.log @@ -58,3 +58,12 @@ 2018-06-23 08:03:28,163;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;DataModel Version Minor => 0 2018-06-23 08:03:28,163;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;DataModel Version Build => 8 2018-06-23 08:03:28,486;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;Terminated OK. +2018-08-25 06:50:57,431;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;Starting IngeniBridge.IBDatabaseParser v1.0.0.0 +2018-08-25 06:50:57,446;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;StorageAccessorAssembly => IngeniBridge.StorageAccessor.InMemory.dll +2018-08-25 06:50:57,446;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;IBDatabase => ..\..\IngeniBridge.Sample.MyCompany\IngeniBridge.Samples.MyCompany\MasterAssetMyCompany_2018_08_25.ibdb +2018-08-25 06:50:57,737;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;DataModel Name => MyCompanyDataModel +2018-08-25 06:50:57,738;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;DataModel Date => 25/08/2018 06:38:25 +2018-08-25 06:50:57,738;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;DataModel Version Majour => 1 +2018-08-25 06:50:57,739;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;DataModel Version Minor => 0 +2018-08-25 06:50:57,739;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;DataModel Version Build => 8 +2018-08-25 06:50:58,118;[1];INFO ;IngeniBridge.IBDatabaseParser.Program;Terminated OK. diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.pdb b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.pdb index d46bc00..89701d0 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.pdb and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.IBDatabaseParser.pdb differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll index 763a322..f1780f7 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/IngeniBridge.StorageAccessor.InMemory.dll differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.dll b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.dll index 13843b6..a5b38cc 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.dll and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.dll differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.xml b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.xml index e908e45..de092d6 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.xml +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/bin/Release/JT.TechCases.Threading.xml @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache index 8895ff5..f2913c2 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7c0dfefd791ee48304b8251f42594836b7f96d2d +98fc6145b84aefbfcc25ccc5a0d3057d8ee38472 diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache index c60d78d..25d5400 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Debug/IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index effcf00..b15167e 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache index 608ef22..f98f043 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -10bcc32781d34f1793bef09b54a684936a577353 +818ff818a9dc572895752f68eeca62d5de093d56 diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.FileListAbsolute.txt b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.FileListAbsolute.txt index 2c5cc08..135cc52 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.FileListAbsolute.txt +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csproj.FileListAbsolute.txt @@ -38,3 +38,4 @@ C:\Users\joset\repos_github\IngeniBridge\IngeniBridge.Programs\IngeniBridge.IBDa C:\Users\joset\repos_github\IngeniBridge\IngeniBridge.Programs\IngeniBridge.IBDatabaseParser\bin\Release\Newtonsoft.Json.xml C:\Users\joset\repos_github\IngeniBridge\IngeniBridge.Programs\IngeniBridge.IBDatabaseParser\bin\Release\System.ValueTuple.xml C:\Users\joset\repos_github\IngeniBridge\IngeniBridge.Programs\IngeniBridge.IBDatabaseParser\obj\Release\IngeniBridge.IBDatabaseParser.csproj.CopyComplete +C:\Users\joset\repos_github\IngeniBridge\IngeniBridge.Programs\IngeniBridge.IBDatabaseParser\obj\Release\IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache new file mode 100644 index 0000000..a98e7db Binary files /dev/null and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.csprojAssemblyReference.cache differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.exe b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.exe index d80aedb..863774b 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.exe and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.exe differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.pdb b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.pdb index d46bc00..89701d0 100644 Binary files a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.pdb and b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/obj/Release/IngeniBridge.IBDatabaseParser.pdb differ diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/packages.config b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/packages.config index e700e92..3be3398 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/packages.config +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/packages.config @@ -2,9 +2,9 @@ - - - + + + diff --git a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg deleted file mode 100644 index 6d2d022..0000000 Binary files a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg and /dev/null differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll deleted file mode 100644 index 50719c5..0000000 Binary files a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll and /dev/null differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/.signature.p7s b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/.signature.p7s new file mode 100644 index 0000000..31b60f8 Binary files /dev/null and b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/.signature.p7s differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg new file mode 100644 index 0000000..ec39928 Binary files /dev/null and b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML similarity index 89% rename from IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML rename to IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML index 6bb120c..b8046c3 100644 --- a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML +++ b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll new file mode 100644 index 0000000..3e8448a Binary files /dev/null and b/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/IngeniBridge.StorageAccessor.InMemory.1.0.3.nupkg b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/IngeniBridge.StorageAccessor.InMemory.1.0.3.nupkg deleted file mode 100644 index 1f52c9d..0000000 Binary files a/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/IngeniBridge.StorageAccessor.InMemory.1.0.3.nupkg and /dev/null differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll deleted file mode 100644 index 763a322..0000000 Binary files a/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll and /dev/null differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/.signature.p7s b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/.signature.p7s new file mode 100644 index 0000000..11ec496 Binary files /dev/null and b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/.signature.p7s differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/IngeniBridge.StorageAccessor.InMemory.1.0.6.nupkg b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/IngeniBridge.StorageAccessor.InMemory.1.0.6.nupkg new file mode 100644 index 0000000..0c31b7c Binary files /dev/null and b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/IngeniBridge.StorageAccessor.InMemory.1.0.6.nupkg differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll new file mode 100644 index 0000000..f1780f7 Binary files /dev/null and b/IngeniBridge.Programs/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll differ diff --git a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg deleted file mode 100644 index ff1e0ae..0000000 Binary files a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg and /dev/null differ diff --git a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll deleted file mode 100644 index 13843b6..0000000 Binary files a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll and /dev/null differ diff --git a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/.signature.p7s b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/.signature.p7s new file mode 100644 index 0000000..347e27b Binary files /dev/null and b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/.signature.p7s differ diff --git a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg new file mode 100644 index 0000000..c479cd0 Binary files /dev/null and b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg differ diff --git a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML similarity index 88% rename from IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML rename to IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML index e908e45..de092d6 100644 --- a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML +++ b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll new file mode 100644 index 0000000..a5b38cc Binary files /dev/null and b/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll differ diff --git a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/.suo b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/.suo index 0b136eb..1a42dd5 100644 Binary files a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/.suo and b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/.suo differ diff --git a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide index 56758a8..1c7d041 100644 Binary files a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide and b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide differ diff --git a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-shm b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-shm deleted file mode 100644 index 12f3be4..0000000 Binary files a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-shm and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-wal b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-wal deleted file mode 100644 index 70e324a..0000000 Binary files a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-wal and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj index debf06e..1bad9c2 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj @@ -44,18 +44,14 @@ ..\packages\IngeniBridge.BuildUtils.1.0.5\lib\net461\IngeniBridge.BuildUtils.dll - - ..\packages\IngeniBridge.Core.1.0.33\lib\net461\IngeniBridge.Core.dll - True - True + + ..\packages\IngeniBridge.Core.1.0.36\lib\net461\IngeniBridge.Core.dll - - ..\packages\IngeniBridge.StorageAccessor.InMemory.1.0.3\lib\net461\IngeniBridge.StorageAccessor.InMemory.dll - True + + ..\packages\IngeniBridge.StorageAccessor.InMemory.1.0.6\lib\net461\IngeniBridge.StorageAccessor.InMemory.dll - - ..\packages\JT.TechCases.Threading.1.0.10\lib\net452\JT.TechCases.Threading.dll - True + + ..\packages\JT.TechCases.Threading.1.0.11\lib\net45\JT.TechCases.Threading.dll ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/MasterAssetMyCompany_2018_08_25.ibdb b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/MasterAssetMyCompany_2018_08_25.ibdb new file mode 100644 index 0000000..6b2a635 Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/MasterAssetMyCompany_2018_08_25.ibdb differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs index 8247462..84a8acf 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs @@ -1,4 +1,7 @@ using IngeniBridge.Core.Diags; +using IngeniBridge.Core.MetaHelper; +using IngeniBridge.Core.StagingData; +using IngeniBridge.BuildUtils; using MyCompanyDataModel; using System; using System.Collections.Generic; @@ -6,30 +9,29 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -using log4net; -using System.Diagnostics; +using IngeniBridge.Core.Util; +using IngeniBridge.Core.Storage; using System.IO; using OfficeOpenXml; -using IngeniBridge.Core.Storage; -using IngeniBridge.Core.Util; +using IngeniBridge.Core.Inventory; +using log4net; +using System.Diagnostics; namespace IngeniBridge.Samples.MyCompany { class Program { private static readonly ILog log = LogManager.GetLogger ( System.Reflection.MethodBase.GetCurrentMethod ().DeclaringType ); - static int Main ( string [] args ) + static int Main ( string [ ] args ) { - log4net.Config.XmlConfigurator.Configure (); int ret = 0; try { + log4net.Config.XmlConfigurator.Configure (); FileVersionInfo fvi = FileVersionInfo.GetVersionInfo ( Assembly.GetEntryAssembly ().Location ); log.Info ( fvi.ProductName + " v" + fvi.FileVersion + " -- " + fvi.LegalCopyright ); log.Info ( "Starting => " + Assembly.GetEntryAssembly ().GetName ().Name + " v" + Assembly.GetEntryAssembly ().GetName ().Version ); - log.Info ( "Data Model => " + Assembly.GetAssembly ( typeof ( ProductionSite ) ).GetName ().Name + " v" + Assembly.GetAssembly ( typeof ( ProductionSite ) ) .GetName ().Version ); - TypeOfMeasure [] tom = new TypeOfMeasure [ 0 ]; - Type t = tom.GetType (); + log.Info ( "Data Model => " + Assembly.GetAssembly ( typeof ( ProductionSite ) ).GetName ().Name + " v" + Assembly.GetAssembly ( typeof ( ProductionSite ) ).GetName ().Version ); #region init IngeniBridge UriBuilder uri = new UriBuilder ( Assembly.GetExecutingAssembly ().CodeBase ); string path = Path.GetDirectoryName ( Uri.UnescapeDataString ( uri.Path ) ); @@ -71,13 +73,13 @@ static int Main ( string [] args ) #endregion #region assets ProductionSite siteParis = new ProductionSite () { Code = "Site of Paris", Label = "Site of Paris, production of water", Location = "Paris", Sector = accessor.FindNomenclatureEntry ( "W" ) }; - siteParis.Zone = accessor.FindChildObject ( root.StorageUniqueID, "InfluenceZones", "Z1" ); + siteParis.Zone = accessor.FindChildEntity ( root.StorageUniqueID, "InfluenceZones", "Z1" ).Entity; root.AddChildAsset ( siteParis ); ProductionSite siteLivry = new ProductionSite () { Code = "Site of Livry", Label = "Site of Livry-Gargan, quality of water", Location = "Livry-Gargan", Sector = accessor.FindNomenclatureEntry ( "S" ) }; - siteLivry.Zone = accessor.FindChildObject ( root.StorageUniqueID, "InfluenceZones", "Z2" ); + siteLivry.Zone = accessor.FindChildEntity ( root.StorageUniqueID, "InfluenceZones", "Z2" ).Entity; root.AddChildAsset ( siteLivry ); ProductionSite siteLeRaincy = new ProductionSite () { Code = "Site of Le Raincy", Label = "Site of Le Raincy, Itercommunication", Location = "Le Raincy", Sector = accessor.FindNomenclatureEntry ( "S" ) }; - siteLeRaincy.Zone = accessor.FindChildObject ( root.StorageUniqueID, "InfluenceZones", "Z2" ); + siteLeRaincy.Zone = accessor.FindChildEntity ( root.StorageUniqueID, "InfluenceZones", "Z2" ).Entity; root.AddChildAsset ( siteLeRaincy ); GroupOfPumps grouppumps = new GroupOfPumps () { Code = "GP 001" }; siteParis.AddChildAsset ( grouppumps ); @@ -122,8 +124,21 @@ static int Main ( string [] args ) TreeChecker tc = new TreeChecker ( accessor ); tc.CheckTree ( true, message => { - Console.WriteLine ( "error => " + message ); + log.Info ( "error => " + message ); + } ); + int nbtotalassets = 0; + int nbtotaldatas = 0; + new Diagnostic ( accessor ).Diagnose ( ( assettype, nbassets, nbdatas ) => + { + log.Info ( assettype + " => " + nbassets.ToString () + ", nbvars => " + nbdatas.ToString () ); + nbtotalassets += nbassets; + nbtotaldatas += nbdatas; + }, ( nomenclature, nbentries ) => + { + log.Info ( nomenclature + ", nbentries => " + nbentries.ToString () ); } ); + log.Info ( "nb total assets => " + nbtotalassets.ToString () ); + log.Info ( "nb total datas => " + nbtotaldatas.ToString () ); accessor.CloseDB (); #endregion } @@ -132,7 +147,6 @@ static int Main ( string [] args ) log.Error ( "Exception => " + e.GetType () + " = " + e.Message ); ret = 1; } - log.Info ( "Terminated => " + ret.ToString () ); return ( ret ); } } diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.dll b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.dll index 50719c5..3e8448a 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.dll and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.xml b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.xml index 6bb120c..b8046c3 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.xml +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Core.xml @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.exe b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.exe index 693b6bf..2e1f701 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.exe and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.exe differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.log b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.log index d2cfbdf..8ed6eaf 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.log +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.log @@ -190,3 +190,19 @@ 2018-06-23 08:02:04,982;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Starting => IngeniBridge.Samples.MyCompany v1.0.0.0 2018-06-23 08:02:04,982;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Data Model => MyCompanyDataModel v1.0.8.41165 2018-06-23 08:02:05,540;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Terminated => 0 +2018-08-25 06:38:25,060;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;IngeniBridge.Samples.MyCompany v1.0.0.0 -- Copyright © 2016 +2018-08-25 06:38:25,088;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Starting => IngeniBridge.Samples.MyCompany v1.0.0.0 +2018-08-25 06:38:25,089;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Data Model => MyCompanyDataModel v1.0.8.11699 +2018-08-25 06:38:25,875;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;TypeOfMeasure, nbentries => 5 +2018-08-25 06:38:25,876;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Sector, nbentries => 2 +2018-08-25 06:38:25,876;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;City, nbentries => 2 +2018-08-25 06:38:25,878;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;ProductionSite => 3, nbvars => 1 +2018-08-25 06:38:25,878;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;GroupOfPumps => 1, nbvars => 1 +2018-08-25 06:38:25,879;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;WaterPump => 2, nbvars => 2 +2018-08-25 06:38:25,879;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;PressureSensor => 1, nbvars => 1 +2018-08-25 06:38:25,879;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;ClorineInjector => 1, nbvars => 4 +2018-08-25 06:38:25,879;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;MultiFunctionSensor => 1, nbvars => 1 +2018-08-25 06:38:25,879;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;WaterSwitcher => 1, nbvars => 1 +2018-08-25 06:38:25,880;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;InfluenceZone => 2, nbvars => 0 +2018-08-25 06:38:25,880;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total assets => 12 +2018-08-25 06:38:25,880;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total datas => 11 diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.pdb b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.pdb index aeccc35..378a3a8 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.pdb and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.pdb differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.StorageAccessor.InMemory.dll b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.StorageAccessor.InMemory.dll index 763a322..f1780f7 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.StorageAccessor.InMemory.dll and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.StorageAccessor.InMemory.dll differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.dll b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.dll index 13843b6..a5b38cc 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.dll and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.dll differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.xml b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.xml index e908e45..de092d6 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.xml +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/JT.TechCases.Threading.xml @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.dll b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.dll index 635e023..6c28e18 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.dll and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.dll differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.pdb b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.pdb index 93d36fe..5f39a35 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.pdb and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/MyCompanyDataModel.pdb differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csproj.CoreCompileInputs.cache b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csproj.CoreCompileInputs.cache index 164198f..0774803 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csproj.CoreCompileInputs.cache +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0f99a0a6d0e77f8d401caa608dcb2e30b24ae6de +ddc4ac7340a834afe2ea15ee56d93d6dbf4f998d diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csprojAssemblyReference.cache b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csprojAssemblyReference.cache index bfcdbab..c3b7342 100644 Binary files a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csprojAssemblyReference.cache and b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/obj/Debug/IngeniBridge.Samples.MyCompany.csprojAssemblyReference.cache differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/packages.config b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/packages.config index 2e5ac51..4697fa3 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/packages.config +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/packages.config @@ -2,9 +2,9 @@ - - - + + + diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs index f0fac54..ca78bc8 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs @@ -12,23 +12,26 @@ namespace MyCompanyDataModel { public class DatavizIndexHelper : IDatavizIndexHelper { - public string IndexNode ( MetaHelper helper, IteratedNode inode ) + public string IndexNode ( StorageAccessor accessor, string PathInTree, object node ) { StringBuilder ret = new StringBuilder (); - inode.Parents.All ( asset => + string [ ] l = StorageFormatter.GetAllParentsPathFromFullPath ( PathInTree ); + StorageFormatter.GetAllParentsPathFromFullPath ( PathInTree ).All ( parentpath => { - EntityMetaDescription emd = helper.GetMetaDataFromType ( asset.GetType () ); - ret.Append ( emd.EntityDisplayName + " - " ); - ret.Append ( helper.RetrieveCodeValue ( asset ) + " - " ); - ret.Append ( helper.RetrieveLabelValue ( asset ) + " - " ); + StorageNode parent = accessor.RetrieveEntityFromPath ( parentpath ); + EntityMetaDescription emd_ = accessor.MetaHelper.GetMetaDataFromType ( parent.Entity.GetType () ); + ret.Append ( emd_.EntityDisplayName + " - " ); + ret.Append ( accessor.ContentHelper.RetrieveCodeValue ( parent ) + " - " ); + ret.Append ( accessor.ContentHelper.RetrieveLabelValue ( parent ) + " - " ); return ( true ); } ); - ret.Append ( inode.vemdNode.EntityDisplayName + " - " ); - ret.Append ( helper.RetrieveCodeValue ( inode.Node ) + " - " ); - ret.Append ( helper.RetrieveLabelValue ( inode.Node ) + " - " ); - helper.ParseAttributes ( inode.Node, ( AttributeMetaDescription attribute, object val ) => + EntityMetaDescription emd = accessor.MetaHelper.GetMetaDataFromType ( node.GetType () ); + ret.Append ( emd.EntityDisplayName + " - " ); + ret.Append ( accessor.ContentHelper.RetrieveCodeValue ( node ) + " - " ); + ret.Append ( accessor.ContentHelper.RetrieveLabelValue ( node ) + " - " ); + accessor.ContentHelper.ParseAttributes ( node, ( AttributeMetaDescription attribute, object val ) => { - if ( val.GetType ().IsSubclassOf ( typeof ( Nomenclature ) ) || val.GetType ().IsSubclassOf ( typeof ( Asset ) ) ) ret.Append ( helper.RetrieveLabelValue ( val ) + " - " ); + if ( val.GetType ().IsSubclassOf ( typeof ( Nomenclature ) ) || val.GetType ().IsSubclassOf ( typeof ( Asset ) ) ) ret.Append ( accessor.ContentHelper.RetrieveLabelValue ( val ) + " - " ); else if ( attribute.IsEnum == true ) ret.Append ( val.ToString () + " - " ); return ( true ); }, true, true ); diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj index ae5c6b7..49bdb11 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj @@ -36,12 +36,11 @@ x64 - - ..\packages\IngeniBridge.Core.1.0.33\lib\net461\IngeniBridge.Core.dll + + ..\packages\IngeniBridge.Core.1.0.36\lib\net461\IngeniBridge.Core.dll - - ..\packages\JT.TechCases.Threading.1.0.10\lib\net452\JT.TechCases.Threading.dll - True + + ..\packages\JT.TechCases.Threading.1.0.11\lib\net45\JT.TechCases.Threading.dll ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.dll b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.dll index 50719c5..3e8448a 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.dll and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.xml b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.xml index 6bb120c..b8046c3 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.xml +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/IngeniBridge.Core.xml @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.dll b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.dll index 13843b6..a5b38cc 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.dll and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.dll differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.xml b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.xml index e908e45..de092d6 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.xml +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/JT.TechCases.Threading.xml @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.dll b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.dll index 635e023..6c28e18 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.dll and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.dll differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.pdb b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.pdb index 93d36fe..5f39a35 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.pdb and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/MyCompanyDataModel.pdb differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 97f8b1b..e0a4125 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csproj.CoreCompileInputs.cache b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csproj.CoreCompileInputs.cache index beabdd1..d773581 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csproj.CoreCompileInputs.cache +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -347d1388f4092e3e957c65f93190aaa0760e2f74 +5180a2631a952df56e3caed8eabe019cbdadbc75 diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csprojAssemblyReference.cache b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csprojAssemblyReference.cache index 177af0b..8e18bb1 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csprojAssemblyReference.cache and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.csprojAssemblyReference.cache differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.dll b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.dll index 635e023..6c28e18 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.dll and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.dll differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.pdb b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.pdb index 93d36fe..5f39a35 100644 Binary files a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.pdb and b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/MyCompanyDataModel.pdb differ diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/packages.config b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/packages.config index 2726899..cf736cc 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/packages.config +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg deleted file mode 100644 index 6d2d022..0000000 Binary files a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll deleted file mode 100644 index 50719c5..0000000 Binary files a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/.signature.p7s b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/.signature.p7s new file mode 100644 index 0000000..31b60f8 Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/.signature.p7s differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg new file mode 100644 index 0000000..ec39928 Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML similarity index 89% rename from IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML rename to IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML index 6bb120c..b8046c3 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML +++ b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll new file mode 100644 index 0000000..3e8448a Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/IngeniBridge.StorageAccessor.InMemory.1.0.3.nupkg b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/IngeniBridge.StorageAccessor.InMemory.1.0.3.nupkg deleted file mode 100644 index 1f52c9d..0000000 Binary files a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/IngeniBridge.StorageAccessor.InMemory.1.0.3.nupkg and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll deleted file mode 100644 index 763a322..0000000 Binary files a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.3/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/.signature.p7s b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/.signature.p7s new file mode 100644 index 0000000..11ec496 Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/.signature.p7s differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/IngeniBridge.StorageAccessor.InMemory.1.0.6.nupkg b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/IngeniBridge.StorageAccessor.InMemory.1.0.6.nupkg new file mode 100644 index 0000000..0c31b7c Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/IngeniBridge.StorageAccessor.InMemory.1.0.6.nupkg differ diff --git a/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll new file mode 100644 index 0000000..f1780f7 Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/IngeniBridge.StorageAccessor.InMemory.1.0.6/lib/net461/IngeniBridge.StorageAccessor.InMemory.dll differ diff --git a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg deleted file mode 100644 index ff1e0ae..0000000 Binary files a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll deleted file mode 100644 index 13843b6..0000000 Binary files a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/.signature.p7s b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/.signature.p7s new file mode 100644 index 0000000..347e27b Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/.signature.p7s differ diff --git a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg new file mode 100644 index 0000000..c479cd0 Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg differ diff --git a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML similarity index 88% rename from IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML rename to IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML index e908e45..de092d6 100644 --- a/IngeniBridge.Programs/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML +++ b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll new file mode 100644 index 0000000..a5b38cc Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/.suo b/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/.suo index dc4dd28..a390bf0 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/.suo and b/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/.suo differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-shm b/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-shm index 12f3be4..694a440 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-shm and b/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-shm differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-wal b/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-wal index 46ab7f2..e0d9dde 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-wal and b/IngeniBridge.TestServer/IngeniBridge.TestServer/.vs/IngeniBridge.TestServer/v15/Server/sqlite3/storage.ide-wal differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/CorrelationInfluenceZone.cs b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/CorrelationInfluenceZone.cs new file mode 100644 index 0000000..58e76ba --- /dev/null +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/CorrelationInfluenceZone.cs @@ -0,0 +1,59 @@ +using IngeniBridge.Core; +using IngeniBridge.Core.MetaHelper; +using IngeniBridge.Core.Mining; +using IngeniBridge.Core.Serialization; +using IngeniBridge.Core.Service; +using IngeniBridge.Core.StagingData; +using IngeniBridge.Core.Storage; +using log4net; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace IngeniBridge.Server.TestServer +{ + public class CorrelationInfluenceZone + { + public static void Launch ( HttpClient client, string buf ) + { + Program.log.Info ( "CorrelationInfluenceZoneBusinessUseCase ==============================" ); + Task response = client.GetAsync ( Program.url + "/DataModel" ); + byte [ ] buffer = response.Result.Content.ReadAsByteArrayAsync ().Result; + Assembly DataModelAssembly = StorageAccessor.RebuildDataModel ( buffer ); + MetaHelper helper = new MetaHelper ( DataModelAssembly ); + EntityContentHelper contenthelper = new EntityContentHelper ( helper ); + ContextedData cd = ContextedAssetSerializer.DeserializeContextedDatasFromString ( buf ) [ 0 ]; // here get the first and unique data returned by the request : TimedData.TimedDataExternalReference=EXTREF 004 + // + // the business use case states that: + // - correlating two alarms should be made on the influence zone (the same influence zone for 2 or more alarms) + // - the influence zone is set on an equipement asset but that could change as the metamodel gets more accurate + // - the influence zone is set on a parent of the data but the exact position is variable is a data come from an iot or from from an equipement or any other case + // + // conclusion: + // - reading the use case specification, identifying the influence zone for correlation should be made using discovery features of IngeniBridge + // + // now find influence zone for correlation + string influencezonecode = ""; + string path = ""; + cd.Parents.Reverse ().All ( parent => + { + path += parent.Code + "\\"; + response = client.GetAsync ( Program.url + "/REQUESTER/RetrieveEntityFromPath?PathInTree=" + path + "&CallingApplication=IngeniBridge.TestServer" ); + buf = response.Result.Content.ReadAsStringAsync ().Result; + ContextedAsset ca = ContextedAssetSerializer.DeserializeContextedAssetsFromString ( buf ) [ 0 ]; + object [ ] vals = contenthelper.RetrieveValuesFromType ( ca.Asset, "InfluenceZone" ); + if ( vals?.Count () > 0 ) influencezonecode = contenthelper.RetrieveCodeValue ( vals [ 0 ] ); + return ( influencezonecode.Length == 0 ); + } ); + Console.WriteLine ( "Influence Zone found = " + influencezonecode ); + } + } +} diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj index 539b836..032f323 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj @@ -42,12 +42,11 @@ ..\packages\IngeniBridge.BuildUtils.1.0.5\lib\net461\IngeniBridge.BuildUtils.dll - - ..\packages\IngeniBridge.Core.1.0.33\lib\net461\IngeniBridge.Core.dll + + ..\packages\IngeniBridge.Core.1.0.36\lib\net461\IngeniBridge.Core.dll - - ..\packages\JT.TechCases.Threading.1.0.10\lib\net452\JT.TechCases.Threading.dll - True + + ..\packages\JT.TechCases.Threading.1.0.11\lib\net45\JT.TechCases.Threading.dll ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll @@ -75,6 +74,9 @@ + + + diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj.user b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj.user new file mode 100644 index 0000000..6cbe588 --- /dev/null +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj.user @@ -0,0 +1,6 @@ + + + + ProjectFiles + + \ No newline at end of file diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/MethodMapping.cs b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/MethodMapping.cs new file mode 100644 index 0000000..70827ec --- /dev/null +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/MethodMapping.cs @@ -0,0 +1,54 @@ +using IngeniBridge.Core; +using IngeniBridge.Core.MetaHelper; +using IngeniBridge.Core.Mining; +using IngeniBridge.Core.Serialization; +using IngeniBridge.Core.Service; +using IngeniBridge.Core.StagingData; +using IngeniBridge.Core.Storage; +using log4net; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace IngeniBridge.Server.TestServer +{ + public class MethodMapping + { + public static void Launch ( HttpClient client, string buf ) + { + Program.log.Info ( "MethodMapping ==============================" ); + Task response = client.GetAsync ( Program.url + "/DataModel" ); + byte [ ] buffer = response.Result.Content.ReadAsByteArrayAsync ().Result; + Assembly DataModelAssembly = StorageAccessor.RebuildDataModel ( buffer ); + MetaHelper helper = new MetaHelper ( DataModelAssembly ); + EntityContentHelper contenthelper = new EntityContentHelper ( helper ); + ContextedData [ ] cds = ContextedAssetSerializer.DeserializeContextedDatasFromString ( buf ); + cds.All ( cd => + { + Console.Write ( "Path => " ); + cd.Parents.Reverse ().All ( parent => { Console.Write ( parent.Code + "\\" ); return ( true ); } ); + Console.WriteLine (); + Console.Write ( "Type => " + cd.Data.GetType ().FullName + "\n" ); + Console.Write ( "Code => " + cd.Data.Code + "\n" ); + Console.WriteLine (); + EntityMetaDescription emd = helper.GetMetaDataFromType ( cd.Data.GetType () ); + contenthelper.ParseAttributes ( cd.Data, ( attribute, val ) => + { + Console.WriteLine ( "\t" + attribute + " (type=" + val.GetType ().Name + ") => " + val.ToString () + "\n" ); + return ( true ); + }, true, true, true ); + object [ ] vals = contenthelper.RetrieveValuesFromType ( cd.Data, "TypeOfMeasure" ); + if ( vals?.Count () > 0 ) Console.WriteLine ( "Found type TypeOfMeasure in object, value is => " + contenthelper.RetrieveCodeValue ( vals [ 0 ] ) ); + return ( true ); + } ); + } + } +} diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/MethodRest.cs b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/MethodRest.cs new file mode 100644 index 0000000..f335d93 --- /dev/null +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/MethodRest.cs @@ -0,0 +1,51 @@ +using IngeniBridge.Core; +using IngeniBridge.Core.MetaHelper; +using IngeniBridge.Core.Mining; +using IngeniBridge.Core.Serialization; +using IngeniBridge.Core.Service; +using IngeniBridge.Core.StagingData; +using IngeniBridge.Core.Storage; +using log4net; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace IngeniBridge.Server.TestServer +{ + public class MethodRest + { + public static void Launch ( HttpClient client, string buf ) + { + Program.log.Info ( "MethodREST ==============================" ); + JArray jsonRoot = ( JArray ) JsonConvert.DeserializeObject ( buf ); + if ( jsonRoot.Children ().Count () == 0 ) Console.WriteLine ( "last page reached" ); + jsonRoot.Children ().All ( contexteddata => + { + StringBuilder path = new StringBuilder (); + JArray parents = ( JArray ) ( contexteddata [ "Parents" ] [ "$values" ] ); + parents.Children ().Reverse ().All ( hierarchie => + { + string code = ( string ) hierarchie [ "Code" ]; + path.Append ( code + "\\" ); + return ( true ); + } ); + JToken data = ( JToken ) contexteddata [ "Data" ]; + string type = contexteddata [ "Data" ] [ "$type" ].ToString (); + NodeInfo ni = NodeInfo.RetrieveNodeInfo ( data, path, type ); + Console.Write ( "Path => " + ni.path + "\n" ); + Console.Write ( "Type => " + ni.type + "\n" ); + Console.Write ( "Code => " + ni.attributes [ "Code" ] + "\n" ); + ni.attributes.All ( attr => { Console.WriteLine ( "\t" + attr.Key + " => " + attr.Value + "\n" ); return ( true ); } ); + return ( true ); + } ); + } + } +} diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/NodeInfo.cs b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/NodeInfo.cs index c4fc195..7ff8bd0 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/NodeInfo.cs +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/NodeInfo.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace IngeniBridge.TestServer +namespace IngeniBridge.Server.TestServer { public class NodeInfo { diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/Program.cs b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/Program.cs index 95587a5..32f1fe9 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/Program.cs +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/Program.cs @@ -1,30 +1,29 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using log4net; -using System.Diagnostics; -using System.Reflection; -using System.Net.Http; -using System.Net; -using System.Net.Http.Headers; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json; +using IngeniBridge.Core; using IngeniBridge.Core.MetaHelper; -using System.Runtime.Serialization; -using IngeniBridge.Core.Service; -using System.Runtime.Serialization.Formatters; using IngeniBridge.Core.Mining; +using IngeniBridge.Core.Serialization; +using IngeniBridge.Core.Service; using IngeniBridge.Core.StagingData; using IngeniBridge.Core.Storage; +using log4net; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; -namespace IngeniBridge.TestServer +namespace IngeniBridge.Server.TestServer { class Program { - private static readonly ILog log = LogManager.GetLogger ( System.Reflection.MethodBase.GetCurrentMethod ().DeclaringType ); - static string url = "https://cloud.ingenibridge.com/PublicDemo/Deagital/"; + public static readonly ILog log = LogManager.GetLogger ( System.Reflection.MethodBase.GetCurrentMethod ().DeclaringType ); + public static string url = "https://cloud.ingenibridge.com/PublicDemo/Deagital/"; static int Main ( string [] args ) { log4net.Config.XmlConfigurator.Configure (); @@ -32,8 +31,8 @@ static int Main ( string [] args ) try { FileVersionInfo fvi = FileVersionInfo.GetVersionInfo ( Assembly.GetEntryAssembly ().Location ); - log.Info ( fvi.ProductName + " v" + fvi.FileVersion + " -- " + fvi.LegalCopyright ); - log.Info ( "Starting " + Assembly.GetEntryAssembly ().GetName ().Name + " v" + Assembly.GetEntryAssembly ().GetName ().Version ); + Program.log.Info ( fvi.ProductName + " v" + fvi.FileVersion + " -- " + fvi.LegalCopyright ); + Program.log.Info ( "Starting " + Assembly.GetEntryAssembly ().GetName ().Name + " v" + Assembly.GetEntryAssembly ().GetName ().Version ); //Console.Write ( "Login => " ); //string login = Console.ReadLine (); //Console.Write ( "Password => " ); @@ -46,111 +45,27 @@ static int Main ( string [] args ) //} HttpClientHandler handler = new HttpClientHandler () { UseDefaultCredentials = true }; HttpClient client = new HttpClient (); - client.BaseAddress = new Uri ( url ); + client.BaseAddress = new Uri ( Program.url ); client.DefaultRequestHeaders.Accept.Add ( new MediaTypeWithQualityHeaderValue ( "application/json" ) ); //var byteArray = Encoding.ASCII.GetBytes ( login + ":" + password ); //client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue ( "Basic", Convert.ToBase64String ( byteArray ) ); - log.Info ( "Connecting => " + url ); - Task response = client.GetAsync ( url + "/REQUESTER/RetrieveDatas?PageNumber=0&PageSize=2&CallingApplication=IngeniBridge.TestServer" ); // here find all datas + Program.log.Info ( "Connecting => " + Program.url ); + Task response = client.GetAsync ( Program.url + "/REQUESTER/RetrieveDatas?PageNumber=0&PageSize=2&CallingApplication=IngeniBridge.TestServer" ); // here find all datas string buf = response.Result.Content.ReadAsStringAsync ().Result; - MethodREST ( client, buf ); - MethodMapping ( client, buf ); + MethodRest.Launch ( client, buf ); + MethodMapping.Launch ( client, buf ); // here find data from Historian reference EXTREF 004, the acquisistion platform detected an exceeding threshold, now we must correlate this alarm with an existing alarm - response = client.GetAsync ( url + "/REQUESTER/RetrieveDatas?CorrelationCriteria=TimedData.TimeSeriesExternalReference=EXTREF 004&PageNumber=0&PageSize=10&CallingApplication=IngeniBridge.TestServer" ); + response = client.GetAsync ( Program.url + "/REQUESTER/RetrieveDatas?CorrelationCriteria=TimedData.TimeSeriesExternalReference=EXTREF 004&PageNumber=0&PageSize=10&CallingApplication=IngeniBridge.TestServer" ); buf = response.Result.Content.ReadAsStringAsync ().Result; - CorrelationInfluenceZoneBusinessUseCase ( client, buf ); + CorrelationInfluenceZone.Launch ( client, buf ); } catch ( Exception e ) { - log.Error ( "Exception => " + e.GetType () + " = " + e.Message ); + Program.log.Error ( "Exception => " + e.GetType () + " = " + e.Message ); ret = 1; } - log.Info ( "Terminated => " + ret.ToString () ); + Program.log.Info ( "Terminated => " + ret.ToString () ); return ( ret ); } - static void MethodREST ( HttpClient client, string buf ) - { - log.Info ( "MethodREST ==============================" ); - JArray jsonRoot = ( JArray ) JsonConvert.DeserializeObject ( buf ); - if ( jsonRoot.Children ().Count () == 0 ) Console.WriteLine ( "last page reached" ); - jsonRoot.Children ().All ( contexteddata => - { - StringBuilder path = new StringBuilder (); - JArray parents = ( JArray ) ( contexteddata [ "Parents" ] [ "$values" ] ); - parents.Children ().Reverse ().All ( hierarchie => - { - string code = ( string ) hierarchie [ "Code" ]; - path.Append ( code + "\\" ); - return ( true ); - } ); - JToken data = ( JToken ) contexteddata [ "Data" ]; - string type = contexteddata [ "Data" ] [ "$type" ].ToString (); - NodeInfo ni = NodeInfo.RetrieveNodeInfo ( data, path, type ); - Console.Write ( "Path => " + ni.path + "\n" ); - Console.Write ( "Type => " + ni.type + "\n" ); - Console.Write ( "Code => " + ni.attributes [ "Code" ] + "\n" ); - ni.attributes.All ( attr => { Console.WriteLine ( "\t" + attr.Key + " => " + attr.Value + "\n" ); return ( true ); } ); - return ( true ); - } ); - } - static void MethodMapping ( HttpClient client, string buf ) - { - log.Info ( "MethodMapping ==============================" ); - Task response = client.GetAsync ( url + "/DataModel" ); - byte [] buffer = response.Result.Content.ReadAsByteArrayAsync ().Result; - Assembly DataModelAssembly = StorageAccessor.RebuildDataModel ( buffer ); - MetaHelper helper = new MetaHelper ( DataModelAssembly ); - ContextedData [] cds = ContextedAssetSerializer.DeserializeContextedDatasFromString ( buf ); - cds.All ( cd => - { - Console.Write ( "Path => " ); - cd.Parents.Reverse ().All ( parent => { Console.Write ( parent.Code + "\\" ); return ( true ); } ); - Console.WriteLine (); - Console.Write ( "Type => " + cd.Data.GetType ().FullName + "\n" ); - Console.Write ( "Code => " + cd.Data.Code + "\n" ); - Console.WriteLine (); - EntityMetaDescription emd = helper.GetMetaDataFromType ( cd.Data.GetType () ); - helper.ParseAttributes ( cd.Data, ( attribute, val ) => - { - Console.WriteLine ( "\t" + attribute + " (type=" + val.GetType ().Name + ") => " + val.ToString () + "\n" ); - return ( true ); - }, true, true, true ); - object [] vals = helper.RetrieveValuesFromType ( cd.Data, "TypeOfMeasure" ); - if ( vals?.Count () > 0 ) Console.WriteLine ( "Found type TypeOfMeasure in object, value is => " + helper.RetrieveCodeValue ( vals [ 0 ] ) ); - return ( true ); - } ); - } - static void CorrelationInfluenceZoneBusinessUseCase ( HttpClient client, string buf ) - { - log.Info ( "CorrelationInfluenceZoneBusinessUseCase ==============================" ); - Task response = client.GetAsync ( url + "/DataModel" ); - byte [] buffer = response.Result.Content.ReadAsByteArrayAsync ().Result; - Assembly DataModelAssembly = StorageAccessor.RebuildDataModel ( buffer ); - MetaHelper helper = new MetaHelper ( DataModelAssembly ); - ContextedData cd = ContextedAssetSerializer.DeserializeContextedDatasFromString ( buf ) [ 0 ]; // here get the first and unique data returned by the request : TimedData.ScadaExternalReference=EXTREF 004 - // - // the business use case states that: - // - correlating two alarms should be made on the influence zone (the same influence zone for 2 or more alarms) - // - the influence zone is set on an equipement asset but that could change as the metamodel gets more accurate - // - the influence zone is set on a parent of the data but the exact position is variable is a data come from an iot or from from an equipement or any other case - // - // conclusion: - // - reading the use case specification, identifying the influence zone for correlation should be made using discovery features of IngeniBridge - // - // now find influence zone for correlation - string influencezonecode = ""; - string path = ""; - cd.Parents.Reverse ().All ( parent => - { - path += parent.Code + "\\"; - response = client.GetAsync ( url + "/REQUESTER/RetrieveObject?PathInTree=" + path + "&CallingApplication=IngeniBridge.TestServer" ); - buf = response.Result.Content.ReadAsStringAsync ().Result; - ContextedAsset ca = ContextedAssetSerializer.DeserializeContextedAssetsFromString ( buf ) [ 0 ]; - object [] vals = helper.RetrieveValuesFromType ( ca.Asset, "InfluenceZone" ); - if ( vals?.Count () > 0 ) influencezonecode = helper.RetrieveCodeValue ( vals [ 0 ] ); - return ( influencezonecode.Length == 0 ); - } ); - Console.WriteLine ( "Influence Zone found = " + influencezonecode ); - } } } diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.dll b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.dll index 50719c5..3e8448a 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.dll and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.xml b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.xml index 6bb120c..b8046c3 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.xml +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.Core.xml @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.exe b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.exe index 1b0623b..df79f4b 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.exe and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.exe differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.log b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.log index 995efe2..d2c50cd 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.log +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.log @@ -316,3 +316,10 @@ 2018-06-23 08:01:28,997;[1];INFO ;IngeniBridge.TestServer.Program;MethodMapping ============================== 2018-06-23 08:01:29,386;[1];INFO ;IngeniBridge.TestServer.Program;CorrelationInfluenceZoneBusinessUseCase ============================== 2018-06-23 08:01:29,434;[1];INFO ;IngeniBridge.TestServer.Program;Terminated => 0 +2018-08-25 07:15:10,995;[1];INFO ;IngeniBridge.Server.TestServer.Program;IngeniBridge.TestServer v1.0.0.0 -- Copyright © 2017 +2018-08-25 07:15:11,033;[1];INFO ;IngeniBridge.Server.TestServer.Program;Starting IngeniBridge.TestServer v1.0.0.0 +2018-08-25 07:15:11,053;[1];INFO ;IngeniBridge.Server.TestServer.Program;Connecting => https://cloud.ingenibridge.com/PublicDemo/Deagital/ +2018-08-25 07:15:11,281;[1];INFO ;IngeniBridge.Server.TestServer.Program;MethodREST ============================== +2018-08-25 07:15:11,580;[1];INFO ;IngeniBridge.Server.TestServer.Program;MethodMapping ============================== +2018-08-25 07:15:12,023;[1];INFO ;IngeniBridge.Server.TestServer.Program;CorrelationInfluenceZoneBusinessUseCase ============================== +2018-08-25 07:15:12,081;[1];INFO ;IngeniBridge.Server.TestServer.Program;Terminated => 0 diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.pdb b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.pdb index a219317..51ea77d 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.pdb and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/IngeniBridge.TestServer.pdb differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.dll b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.dll index 13843b6..a5b38cc 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.dll and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.dll differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.xml b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.xml index e908e45..de092d6 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.xml +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/bin/Debug/JT.TechCases.Threading.xml @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e1eb5de..57d4faf 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csproj.CoreCompileInputs.cache b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csproj.CoreCompileInputs.cache index 664a854..5f6eb4d 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csproj.CoreCompileInputs.cache +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a9995215d1bcb39fcf63081e995f1b9071fa8e21 +57711398d340f69caa6911b8d7aba8c5ef59b5e8 diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csprojAssemblyReference.cache b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csprojAssemblyReference.cache index 85873dc..63f54bf 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csprojAssemblyReference.cache and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.csprojAssemblyReference.cache differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.exe b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.exe index 1b0623b..df79f4b 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.exe and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.exe differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.pdb b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.pdb index a219317..51ea77d 100644 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.pdb and b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/obj/Debug/IngeniBridge.TestServer.pdb differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/packages.config b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/packages.config index c0140a5..016a847 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/packages.config +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg deleted file mode 100644 index 6d2d022..0000000 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/IngeniBridge.Core.1.0.33.nupkg and /dev/null differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll deleted file mode 100644 index 50719c5..0000000 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.dll and /dev/null differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/.signature.p7s b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/.signature.p7s new file mode 100644 index 0000000..31b60f8 Binary files /dev/null and b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/.signature.p7s differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg new file mode 100644 index 0000000..ec39928 Binary files /dev/null and b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/IngeniBridge.Core.1.0.36.nupkg differ diff --git a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML similarity index 89% rename from IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML rename to IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML index 6bb120c..b8046c3 100644 --- a/IngeniBridge.Programs/packages/IngeniBridge.Core.1.0.33/lib/net461/IngeniBridge.Core.XML +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.XML @@ -223,9 +223,9 @@ Description field name - + - Scada external reference name + Timed Data external reference name @@ -243,14 +243,19 @@ Indicates if external reference + + + Indicates if nomenclature + + Indicates if description field - + - /// Indicates if scada external reference field + Indicates if timed data external reference field @@ -324,6 +329,127 @@ The string + + + This method retrieves a property value + + Entity instance + Property name + The value + + + + This method retrieves the properties of specified type + + Entity instance + Type name as a string + Looking for array property ? + The property name if specified + + + + + This method retrieves the code property value from an entity + + The entity + the code value + + + + This method sets the code value into an entity + + The entity + The code to set + + + + This method retrieves the label property value from an entity + + The entity + the label value + + + + This method sets the label value into an entity + + The entity + The code to set + + + + This method retrieves the storageuniqueid property value from an entity + + + + + + + This method set a property value + + Entity instance + Property name + The vaue + + + + Notifies linked entities from entity + + Entity type, applies also to derivated entity types + + + + + This method parses linked entities + + Entity type, applies also to derivated entity types + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + This method parses all linked entities (Asset and Nomenclature) + + Entity + Callback to linked entities, + indicates to return nomenclatures as well + indicates wether to return external refs as well + + + + Notifies properties values + + Property name + Value + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to properties, + return external references as properties + + + + Notifies attributes values + + Attribute description + Value + + + + + This method parses all nomenclatures and external references if specified + + Entity + Callback to attributes, + return external references as properties + return nomenclatures as properties + return links to entities as properties + return datas as properties + Root entity @@ -444,6 +570,26 @@ This class contains meta data servicesfor the data model + + + Code property name + + + + + Label property name + + + + + StorageUniqueID property name + + + + + Datas property name + + returns a Dataviz index helper if implemented in the metamodel @@ -463,11 +609,33 @@ The type Meta data information + + + This method loads all meta data information from a data model assembly + + Meta data information + + + + This method retrieves the first property inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the property name if found else null + + + + This method retrieves all the properties inside an object instance compatible with the type + + the object instance + the type to find the compatible property + the properties found + This method returns meta data describing an entity type - The entity type name + The entity type name >Meta data information @@ -494,60 +662,6 @@ >a list of meta data - - - This method loads all meta data information from a data model assembly - - Meta data information - - - - This method retrieves the property name inside an object instance compatible with the type - - the object instance - the type to find the compatible property - the property name if found else null - - - - This method retrieves a property value - - Entity instance - Property name - The value - - - - This method retrieves the properties of specified type - - Entity instance - Type name as a string - Looking for array property ? - The property name if specified - - - - - This method retrieves the code property value from an entity - - The entity - the code value - - - - This method retrieves the label property value from an entity - - The entity - the label value - - - - This method set a property value - - Entity instance - Property name - The vaue - This method retrieves the types list in the model meta information @@ -560,64 +674,6 @@ Types - - - Notifies linked entities from entity - - Entity type, applies also to derivated entity types - - - - - This method parses linked entities - - Entity type, applies also to derivated entity types - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - This method parses all linked entities (Asset and Nomenclature) - - Entity - Callback to linked entities, - indicates wether to return external refs as well - - - - Notifies properties values - - Property name - Value - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to properties, - return external references as properties - - - - Notifies attributes values - - Attribute description - Value - - - - - This method parses all nomenclatures and external references if specified - - Entity - Callback to attributes, - return external references as properties - return nomenclatures as properties - return links to entities as properties - return datas as properties - This class represents the meta information on an IngeniBridge entity @@ -673,21 +729,11 @@ Attribute meta information for label - - - Name of code property - - Indicates if entity must not be indexed - - - Name of label property - - Properties in the entity @@ -805,25 +851,31 @@ The stream string The contexted datas - - - This method parameterizes the json serializer - - - This interface is the Dataviz index contract - + Implement this method to index a node - the helper associated with the metamodel - the iterated node + the storage accessor + the path of the actual node + the iterated node the actual text to be searched through rest calls + + + This class provides services for serialization + + + + + This method parameterizes the json serializer + + + Contexted asset returned by the web service @@ -933,53 +985,35 @@ the string - - - Parents in revere order (the 0 index element is the immediate parent) - - - - - The name of the attribute (in the parent) that contains the actual node - - - - - The actual node - - - + - Meta description associated with the node + This class provides for asset and timeddata object storage - - - The flat path, - - - + - Converts to string + Notifies a node in the tree - The string + Node type, applies also to derivated entites + The node + false to stop, true to continue The root node of the tree - + - Notifies a node in the tree + This function returns the immediate children number - Node type, applies also to derivated entites - The node - false to stop, true to continue + Node type to filter + Unique storage ID + - This class represents a timed data (SCADA or BigData timed value) + This class represents a timed data (Data histrian database timed value) diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll new file mode 100644 index 0000000..3e8448a Binary files /dev/null and b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/IngeniBridge.Core.1.0.36/lib/net461/IngeniBridge.Core.dll differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg deleted file mode 100644 index ff1e0ae..0000000 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/JT.TechCases.Threading.1.0.10.nupkg and /dev/null differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll deleted file mode 100644 index 13843b6..0000000 Binary files a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.dll and /dev/null differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/.signature.p7s b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/.signature.p7s new file mode 100644 index 0000000..347e27b Binary files /dev/null and b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/.signature.p7s differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg new file mode 100644 index 0000000..c479cd0 Binary files /dev/null and b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/JT.TechCases.Threading.1.0.11.nupkg differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML similarity index 88% rename from IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML rename to IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML index e908e45..de092d6 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.10/lib/net452/JT.TechCases.Threading.XML +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.XML @@ -4,78 +4,6 @@ JT.TechCases.Threading - - - - - - - - Initializes a new instance of the class. - - The s context description. - The list exceptions. - - - - Initializes a new instance of the class. - - The s context description. - The ex. - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - - - - Class to display exceptions - - - - - Constructor - - Context - List of exceptions - - - - Context - - Context - Single exception - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - - - Required method for Designer support - do not modify - the contents of this method with the code editor. - - This class is the base for all exceptions. It is important so it can be treated by the global handler. @@ -703,36 +631,14 @@ Returns the execution time spent by the thread (cannot be called before termination) - - - This class is used to monitor running threads. - - - - - This forms dislays all running threads - - - - - Required designer variable. - - - - - Clean up any resources being used. - - true if managed resources should be disposed; otherwise, false. - - + - Required method for Designer support - do not modify - the contents of this method with the code editor. + This class maintains a list of threads and is the only access point to create new ADFThreads. - + - This class maintains a list of threads and is the only access point to create new ADFThreads. + This property returns the threads inside the pool diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll new file mode 100644 index 0000000..a5b38cc Binary files /dev/null and b/IngeniBridge.TestServer/IngeniBridge.TestServer/packages/JT.TechCases.Threading.1.0.11/lib/net45/JT.TechCases.Threading.dll differ