summaryrefslogtreecommitdiff
path: root/src-py/db_controller.py
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2014-10-27 12:44:49 +0200
committerLV-426 <lv-426@taproot.org.il>2014-10-27 12:44:49 +0200
commit69d70685cfdea0ea6b6083d36f6fefd0be0741fe (patch)
tree987515a086966f22cbbce1bf39681e05c3c68cec /src-py/db_controller.py
parentde25fac01980581f98c1ea1f0740e4088aa0c0be (diff)
misc
Diffstat (limited to 'src-py/db_controller.py')
-rw-r--r--src-py/db_controller.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/src-py/db_controller.py b/src-py/db_controller.py
index aa1e8450..f9656212 100644
--- a/src-py/db_controller.py
+++ b/src-py/db_controller.py
@@ -1,20 +1,19 @@
#!/usr/bin/python
-import os
import json
-import re
import logging
+import os
+import re
import traceback
+import urllib2
+from db_driver import DB_Driver_REST, DB_Driver_Base
from model.graph import Attr_Diff
from model.graph import Topo_Diff
-
-import urllib2
-
-import neo4j_util as db_util
-from neo4j_util import cfmt
from neo4j_util import DB_result_set
-from neo4j_util import Neo4JException
+from neo4j_util import cfmt
+import neo4j_util as db_util
+from model.model import Link
log = logging.getLogger('rhizi')
@@ -183,7 +182,7 @@ class DBO_attr_diff_commit(DB_op):
ret = {}
for _, _, r_set in self:
for row in r_set:
- n_id, n = [v for v in row] # we expect a [n_id, n] array
+ n_id, n = [v for v in row] # we expect a [n_id, n] array
ret[n_id] = n
return ret
@@ -234,6 +233,7 @@ class DBO_load_node_set_by_DB_id(DB_op):
"""
load a set of nodes whose DB id is in id_set
+ @param id_set: DB node id set
@return: loaded node set or an empty set if no match was found
"""
super(DBO_load_node_set_by_DB_id, self).__init__()