node create query generation: return named dict

2 files changed, 4 insertions, 4 deletions

diff --git a/src/server/db_op.py b/src/server/db_op.py
index fd4b3ba9..9abac7c8 100644
--- a/src/server/db_op.py
+++ b/src/server/db_op.py
@@ -403,13 +403,13 @@ class DBO_add_node_set(DB_op):
             self.add_statement(q, q_param_set)
 
     def process_result_set(self):
-        n_set = []
+        n_id_set = []
         for _, _, row_set in self:
             for row in row_set:
                 for clo in row:
-                    n_set.append(clo)
+                    n_id_set.append(clo['id'])
 
-        return n_set
+        return n_id_set
 
 class DBO_add_link_set(DB_op):
     def __init__(self, link_map):
diff --git a/src/server/neo4j_util.py b/src/server/neo4j_util.py
index 6289fdc9..3849cdef 100644
--- a/src/server/neo4j_util.py
+++ b/src/server/neo4j_util.py
@@ -187,7 +187,7 @@ def gen_query_create_from_node_map(node_map, input_to_DB_property_map=lambda _:
         assert len(label) > 2 and label[0].isupper(), 'malformed label: ' + label
 
         q_arr = ['create (n:%s {node_attr})' % (quote__backtick(label)),
-                 'return n, labels(n)'
+                 'return {id: n.id, label_set: labels(n)}'
                  ]
 
         q_params_set = []