more robust parsing

Author: oroulet

opcua/common/structures_generator.py

@@ -34,6 +34,13 @@ def __init__(self, name):
         self.code = ""
 
     def get_code(self):
+        if not self.fields:
+            return """
+
+class {}(object):
+    pass
+
+""".format(self.name)
         self._make_constructor()
         self._make_from_binary()
         self._make_to_binary()
@@ -42,9 +49,10 @@ def get_code(self):
     def _make_constructor(self):
         self.code = """
 
+
 class {0}(object):
     '''
-    {0} autogenerated from xml
+    {0} structure autogenerated from xml
     '''
     def __init__(self, data=None):
         if data is not None:
@@ -56,7 +64,7 @@ def __init__(self, data=None):
 
     def _make_from_binary(self):
         self.code += '''
-    @staticmethod 
+    @staticmethod
     def from_binary(data):
         return {}(data=data)
 
@@ -72,7 +80,9 @@ def _binary_init(self, data):
                 if field.array:
                     self.code += '''
         length = ua.ua_binary.Primitives.Int32.unpack(data)
-        if length != -1:
+        if length == -1:
+            self.{0} = None
+        else:
             self.{0} = [ua.{1}.from_binary(data) for _ in range(length)]
 '''.format(field.name, field.uatype)
                 else:
@@ -131,11 +141,9 @@ def _make_model(self):
                     array = True
                     continue
                 field = Field(name)
-                uatype = xmlfield.get("TypeName")
-                if uatype.startswith("opc"):
-                    field.uatype = uatype[4:]
-                else:
-                    field.uatype = uatype[3:]
+                field.uatype = xmlfield.get("TypeName")
+                if ":" in field.uatype:
+                    field.uatype = field.uatype.split(":")[1]
                 field.value = get_default_value(field.uatype)
                 if array:
                     field.array = True
@@ -159,8 +167,6 @@ def get_structures(self):
             exec(struct.get_code(), ld)
         return ld
 
-
-
     def _make_header(self):
         self._file.write("""
 '''
@@ -171,18 +177,18 @@ def _make_header(self):
 import uuid
 
 from opcua import ua
-
-
 """)
 
 
 
 
 if __name__ == "__main__":
     import sys
+    from IPython import embed
     sys.path.insert(0, ".") # necessary for import in current dir
 
-    xmlpath = "/home/olivier/python-opcua/schemas/example.bsd"
+    #xmlpath = "schemas/Opc.Ua.Types.bsd"
+    xmlpath = "schemas/example.bsd"
     c = StructGenerator(xmlpath, "structures.py")
     c.run()
     import structures as s