Fixes #!45

OPCFoundation · Jan 9, 2024 · 80302ba · 80302ba
1 parent 9219ae2
commit 80302ba
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/Opc.Ua.ModelCompiler/NodeSetToModelDesign.cs b/Opc.Ua.ModelCompiler/NodeSetToModelDesign.cs
@@ -202,8 +202,8 @@ private static Namespace CreateNamespace(ModelTableEntry model)
                     PublicationDate = model.PublicationDate.ToString("yyyy-MM-ddT00:00:00Z"),
                     Version = model.Version
                 };
-                ns.XmlPrefix = ns.Name;
-                ns.Name = ns.Name.Replace(".", " ");
+                ns.XmlPrefix = ns.Prefix = ns.Name;
+                ns.Name = ns.Name.Replace(".", "");
             }
 
             if (ns.Value == Namespaces.OpcUa)
@@ -1181,6 +1181,7 @@ private NodeDesign ImportNode(NodeSet.UANode input)
 
             output.SymbolicId = m_symbolicIds[input.NodeId];
             output.SymbolicName = ImportSymbolicName(input);
+            output.Extensions = input.Extensions;
 
             if (input is UAType)
             {

diff --git a/Opc.Ua.ModelCompiler/UA Model Design.cs b/Opc.Ua.ModelCompiler/UA Model Design.cs
@@ -31,6 +31,8 @@ public partial class ModelDesign {
 
         private NodeDesign[] itemsField;
 
+        private System.Xml.XmlElement[] extensionsField;
+
         private string targetNamespaceField;
 
         private string targetVersionField;
@@ -91,6 +93,17 @@ public NodeDesign[] Items {
             }
         }
 
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("Extension", IsNullable=false)]
+        public System.Xml.XmlElement[] Extensions {
+            get {
+                return this.extensionsField;
+            }
+            set {
+                this.extensionsField = value;
+            }
+        }
+
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string TargetNamespace {
@@ -932,6 +945,8 @@ public partial class NodeDesign {
 
         private bool defaultAccessRestrictionsFieldSpecified;
 
+        private System.Xml.XmlElement[] extensionsField;
+
         private System.Xml.XmlQualifiedName symbolicNameField;
 
         private System.Xml.XmlQualifiedName symbolicIdField;
@@ -1082,6 +1097,17 @@ public bool DefaultAccessRestrictionsSpecified {
             }
         }
 
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("Extension", IsNullable=false)]
+        public System.Xml.XmlElement[] Extensions {
+            get {
+                return this.extensionsField;
+            }
+            set {
+                this.extensionsField = value;
+            }
+        }
+
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public System.Xml.XmlQualifiedName SymbolicName {

diff --git a/Opc.Ua.ModelCompiler/UA Model Design.xsd b/Opc.Ua.ModelCompiler/UA Model Design.xsd
@@ -50,6 +50,7 @@
           <xs:element name="Dictionary" type="DictionaryDesign" minOccurs="0" />
           <xs:element name="View" type="ViewDesign" minOccurs="0" />
         </xs:choice>
+        <xs:element name="Extensions" type="ListOfExtensions" minOccurs="0" />
       </xs:sequence>
       <xs:attribute name="TargetNamespace" type="xs:string" use="required" />
       <xs:attribute name="TargetVersion" type="xs:string" use="optional" />
@@ -148,6 +149,18 @@
     </xs:simpleContent>
   </xs:complexType>
 
+  <xs:complexType name="ListOfExtensions">
+    <xs:sequence>
+      <xs:element name="Extension" minOccurs="0" maxOccurs="unbounded">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" processContents="lax" />
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:simpleType name="ReleaseStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="Released" />
@@ -250,6 +263,7 @@
       </xs:element>
       <xs:element name="AccessRestrictions" type="AccessRestrictions" minOccurs="0" />
       <xs:element name="DefaultAccessRestrictions" type="AccessRestrictions" minOccurs="0" />
+      <xs:element name="Extensions" type="ListOfExtensions" minOccurs="0" />
     </xs:sequence>
     <xs:attribute name="SymbolicName" type="xs:QName" use="optional">
       <xs:annotation>