distinguish __src (obj) vs. __src_id (str)

4 files changed, 28 insertions, 21 deletions

diff --git a/src-py/db_controller.py b/src-py/db_controller.py
index 460686a5..2d4fe8ce 100644
--- a/src-py/db_controller.py
+++ b/src-py/db_controller.py
@@ -426,8 +426,8 @@ class DBO_rz_clone(DB_op):
                         continue
 
                     l = l_tuple[1]
-                    l['__src'] = n['id']
-                    l['__dst'] = l_tuple[0]
+                    l['__src_id'] = n['id']
+                    l['__dst_id'] = l_tuple[0]
                     l['__label_set'] = [l_tuple[2]]  # box single value returned by type()
 
                     ret_l_set.append(l)
diff --git a/src-py/model/model.py b/src-py/model/model.py
index 701074ab..33cf9e6a 100644
--- a/src-py/model/model.py
+++ b/src-py/model/model.py
@@ -3,24 +3,31 @@ class Link():
     documentation anchor - this class currently carries no implementation
     and only acts as a documentation anchor
     
-    link['__src'] - meta attribute for link source
-    link['__dst'] - meta attribute for link destination
+    link['__src'] - meta attribute for link source object
+    link['__dst'] - meta attribute for link destination object
     """
-    
+
+    def __init__(self, src=None, dst=None):
+        assert False, 'currently unused'
+
     class Link_Ptr(dict):
+        """
+        link['__src_id'] - meta attribute for link source id
+        link['__dst_id'] - meta attribute for link destination id
+        """
         def __init__(self, src_id=None, dst_id=None):
             assert None != src_id or None != dst_id
-            
-            self['__src'] = src_id
-            self['__dst'] = dst_id
-        
+
+            self['__src_id'] = src_id
+            self['__dst_id'] = dst_id
+
         @property
         def src_id(self):
-            return self['__src']
+            return self['__src_id']
 
         @property
         def dst_id(self):
-            return self['__dst']
+            return self['__dst_id']
 
     @staticmethod
     def link_ptr(src_id=None, dst_id=None):
diff --git a/src-py/neo4j_util.py b/src-py/neo4j_util.py
index cc3d53d8..a203207f 100644
--- a/src-py/neo4j_util.py
+++ b/src-py/neo4j_util.py
@@ -199,16 +199,16 @@ def gen_query_create_from_link_map(link_map, input_to_DB_property_map=lambda _:
         for link in l_set:
             __type_check_link(link)
 
-            n_src = link['__src']
-            n_dst = link['__dst']
+            src_id = link['__src_id']
+            dst_id = link['__dst_id']
 
             # TODO: use object based link representation
             prop_dict = link.copy()
-            del prop_dict['__dst']
-            del prop_dict['__src']
+            del prop_dict['__dst_id']
+            del prop_dict['__src_id']
 
-            q_params = {'src': { 'id': n_src} ,
-                        'dst': { 'id': n_dst} ,
+            q_params = {'src': { 'id': src_id} ,
+                        'dst': { 'id': dst_id} ,
                         'link_attr' : input_to_DB_property_map(prop_dict)}
             ret.append((q, q_params))
 
@@ -239,8 +239,8 @@ def meta_attr_list_to_meta_attr_map(e_set, meta_attr='__label_set'):
     return ret
 
 def __type_check_link(link):
-    assert link.has_key('__src')
-    assert link.has_key('__dst')
+    assert link.has_key('__src_id')
+    assert link.has_key('__dst_id')
 
 def __type_check_link_or_node_map(x_map):
     for k, v in x_map.iteritems():  # do some type sanity checking
diff --git a/src-py/rhizi_api.py b/src-py/rhizi_api.py
index 8d787a5c..ef904a37 100644
--- a/src-py/rhizi_api.py
+++ b/src-py/rhizi_api.py
@@ -127,8 +127,8 @@ def load_link_set_by_link_ptr_set():
 
         l_ptr_set = []
         for lptr_dict in l_ptr_set_raw:
-            src_id = lptr_dict.get('__src')
-            dst_id = lptr_dict.get('__dst')
+            src_id = lptr_dict.get('__src_id')
+            dst_id = lptr_dict.get('__dst_id')
             l_ptr_set += [Link.Link_Ptr(src_id=src_id, dst_id=dst_id) ]
 
         return l_ptr_set