cleanup

Author: brubbel

opcua/server/address_space_sqlite.py

@@ -67,7 +67,6 @@ def __contains__(self, nodeid):
     def __setitem__(self, key, value):
         # TODO the item in the database it is not updated
         super(AddressSpaceSQLite, self).__setitem__(key, value)
-    
 
     def keys(self):
         raise Exception("dict.keys() is not supported for performance. Use iterator.")
@@ -98,16 +97,17 @@ def dump(self, namespaceidx=AddressSpace.DEFAULT_USER_NAMESPACE_INDEX):
         with self._lock:
             # 2. Populate.
             for nodeid, ndata in self._cache.items():
-                if nodeid.NamespaceIndex != namespaceidx:
-                    for ref in ndata.references:
-                        if ref.NodeId.NamespaceIndex == namespaceidx:
-                            keyNodeId = AddressSpaceSQLite._nodeid_to_key(ndata.nodeid)
-                            AddressSpaceSQLite._insert_reference(self._conn, keyNodeId, ref)
-                            print('INTER_NAMESPACE REF {:s}/{:d}->{:d}'.format(str(nodeid.Identifier), nodeid.NamespaceIndex, ref.NodeId.NamespaceIndex))
-                    continue
                 assert(nodeid == ndata.nodeid)
                 assert(isinstance(ndata, NodeData))
-                AddressSpaceSQLite._write_nodedata(self._conn, ndata)
+                if nodeid.NamespaceIndex == namespaceidx:
+                    AddressSpaceSQLite._write_nodedata(self._conn, ndata)
+                    continue
+                # inter-namespace references.
+                for ref in ndata.references:
+                    if ref.NodeId.NamespaceIndex != namespaceidx:
+                        continue
+                    keyNodeId = AddressSpaceSQLite._nodeid_to_key(ndata.nodeid)
+                    AddressSpaceSQLite._insert_reference(self._conn, keyNodeId, ref)
 
             # 3. Integrity checks.
             for nodeid, ndata in self._cache.items():
@@ -162,11 +162,6 @@ def _read_nodedata(conn, nodeid, nodeData, attrTable=ATTR_TABLE_NAME, refsTable=
         referred_nodeids = [r.NodeId for r in nodeData.references]
         for row in _c_read.execute(cmd2):
             ref = AddressSpaceSQLite._read_reference_row(row)
-            #try:
-            #    idx = referred_nodeids.index(ref.NodeId)
-            #    print('DUPLICATE {:s}'.format(str(ref.NodeId)))
-            #    nodeData.references[idx] = ref
-            #except ValueError:
             nodeData.references.append(ref)
 
     # Read and write from attribute table