Hardening of extracting AAS IDs.

OPCF-Members · Jan 23, 2025 · 6f37fdb · 6f37fdb
1 parent 76e00d4
commit 6f37fdb
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/I4AASNodeManager.cs b/I4AASNodeManager.cs
@@ -13,7 +13,7 @@ public class I4AASNodeManager : CustomNodeManager2
     {
         private long _lastUsedId = 0;
 
-        private string _namespaceURI = "http://opcfoundation.org/UA/" + Program.g_AASEnv?.AssetAdministrationShells[0].IdShort + "/";
+        private string _namespaceURI = "http://opcfoundation.org/UA/AAS2Nodeset/";
 
         public FolderState? _rootAssetAdminShells = null;
         public FolderState? _rootSubmodels = null;
@@ -24,11 +24,23 @@ public I4AASNodeManager(IServerInternal server, ApplicationConfiguration configu
         {
             SystemContext.NodeIdFactory = this;
 
-            List<string> namespaceUris = new()
-            {
-                _namespaceURI
-            };
+            List<string> namespaceUris = new();
 
+            if (!string.IsNullOrEmpty(Program.g_AASEnv?.AssetAdministrationShells[0].IdShort))
+            {
+                _namespaceURI = "http://opcfoundation.org/UA/" + Program.g_AASEnv?.AssetAdministrationShells[0].IdShort.Replace("/", "_").Replace(":", "_") + "/";
+            }
+            else if (!string.IsNullOrEmpty(Program.g_AASEnv?.AssetAdministrationShells[0].Id))
+            {
+                _namespaceURI = "http://opcfoundation.org/UA/" + Program.g_AASEnv?.AssetAdministrationShells[0].Id.Replace("/", "_").Replace(":", "_") + "/";
+            }
+            else if (!string.IsNullOrEmpty(Program.g_AASEnv?.AssetAdministrationShells[0].Identification?.Id))
+            {
+                _namespaceURI = "http://opcfoundation.org/UA/" + Program.g_AASEnv?.AssetAdministrationShells[0].Identification.Id.Replace("/", "_").Replace(":", "_") + "/";
+            }
+
+            namespaceUris.Add(_namespaceURI);
+
             NamespaceUris = namespaceUris;
         }