resolving conflict

Author: djarecka

nidm/experiment/Query.py

@@ -60,7 +60,7 @@ def query_nidm(nidm_file_list,query, output_file=None):
         if first_file:
             #format query result as dataframe and return
             #for dicts in qres._get_bindings():
-            columns = qres.vars
+            columns = [str(var) for var in qres.vars]
             first_file=False
             #    break
 
@@ -78,7 +78,7 @@ def query_nidm(nidm_file_list,query, output_file=None):
     return df
 
 
-def GetProjects(nidm_file_list):
+def GetProjectsUUID(nidm_file_list):
     '''
 
     :param nidm_file_list: List of one or more NIDM files to query across for list of Projects
@@ -101,3 +101,12 @@ def GetProjects(nidm_file_list):
     df = query_nidm(nidm_file_list,query, output_file=None)
 
     return df['uuid'].tolist()
+
+def GetProjectMetadata(nidm_file_list):
+    '''
+
+    :param nidm_file_list: List of one or more NIDM files to query across for list of Projects
+    :return: JSON document of all metadata for all Projects in nidm_file_list
+    '''
+
+    #SPAQRL

nidm/experiment/tests/test_query.py

@@ -0,0 +1,18 @@
+from nidm.experiment import Project, Session, Acquisition, AcquisitionObject, Query
+from nidm.core import Constants
+from rdflib import URIRef
+
+
+def test_GetProjects():
+
+    kwargs={Constants.NIDM_PROJECT_NAME:"FBIRN_PhaseII",Constants.NIDM_PROJECT_IDENTIFIER:9610,Constants.NIDM_PROJECT_DESCRIPTION:"Test investigation"}
+    project = Project(uuid="_123456",attributes=kwargs)
+
+
+    #save a turtle file
+    with open("test.ttl",'w') as f:
+        f.write(project.serializeTurtle())
+
+    project_list = Query.GetProjectsUUID(["test.ttl"])
+
+    assert URIRef(Constants.NIDM + "_123456") in project_list