diff options
Diffstat (limited to 'src/server/neo4j_util.py')
| -rw-r--r-- | src/server/neo4j_util.py | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/server/neo4j_util.py b/src/server/neo4j_util.py index 3ec9b857..ee047b69 100644 --- a/src/server/neo4j_util.py +++ b/src/server/neo4j_util.py @@ -124,24 +124,30 @@ def post(url, data): return ret -def statement_to_REST_form(query, parameters={}): - """ - turn cypher query to neo4j json API format - """ - assert isinstance(query, six.string_types) +def statement_set_to_REST_form(statement_set): + assert isinstance(statement_set, list) - if isinstance(parameters, list): - for v in parameters: - assert isinstance(v, dict) - else: - assert isinstance(parameters, dict) + def _adapt_single_statement_to_REST_form(query, parameters={}): + """ + turn cypher query to neo4j json API format + """ + assert isinstance(query, six.string_types) - return {'statement' : query, 'parameters': parameters} + if isinstance(parameters, list): + for v in parameters: + assert isinstance(v, dict) + else: + assert isinstance(parameters, dict) -def statement_set_to_REST_form(statement_set): - assert isinstance(statement_set, list) + return {'statement' : query, 'parameters': parameters} + + rest_statement_set = [] + for db_query in statement_set: + rest_statement = _adapt_single_statement_to_REST_form(db_query.statement, + db_query.param_set) + rest_statement_set.append(rest_statement) - return {'statements': statement_set} + return {'statements': rest_statement_set} def gen_clause_attr_filter_from_filter_attr_map(filter_attr_map, node_label="n"): if not filter_attr_map: |