[LMS-2301] fixed example scripts and documentation of IDataSourceQueryService

SVN: 22049

datastore_server/resource/examples/data-set-reporting-query-metadata.py

@@ -2,7 +2,7 @@ DATA_SOURCE = "openbis-metadata"
 QUERY = """	
 					SELECT d.code as "DATA_SET_CODE", prty.code as "PROPERTY_CODE", dsp.value as "PROPERTY_VALUE"
 					FROM data d, data_set_properties dsp, data_set_type_property_types dstpt, property_types prty
-					WHERE d.code = ? AND dsp.ds_id = d.id AND dsp.dstpt_id = dstpt.id AND dstpt.prty_id = prty.id
+					WHERE d.code = ?{1} AND dsp.ds_id = d.id AND dsp.dstpt_id = dstpt.id AND dstpt.prty_id = prty.id
 				"""
 
 DATA_SET_CODE = "Data Set"
@@ -16,8 +16,10 @@ def describe(dataSets, tableBuilder):
     tableBuilder.addHeader(PROPERTY_VALUE)
     
     for dataSet in dataSets:
-        results = query_service.select(DATA_SOURCE, QUERY, dataSet.getDataSetCode()) 
-				for r in results:
+        results = queryService.select(DATA_SOURCE, QUERY, [dataSet.getDataSetCode()])
+        print "Found " + str(len(results)) + " results for data set '" + dataSet.getDataSetCode() + "':"
+        for r in results:
+				    print r 	# debugging  
 						row = tableBuilder.addRow()
             row.setCell(DATA_SET_CODE, r.get("DATA_SET_CODE"))
             row.setCell(PROPERTY_CODE, r.get("PROPERTY_CODE"))

datastore_server/resource/examples/data-set-reporting-query-path-info-db.py

 DATA_SOURCE = "path-info-db"
 QUERY = """	
-					SELECT ds.code as "DATA_SET_CODE", dsf.*
+					SELECT ds.code as "data_set_code", dsf.*
 					FROM data_sets ds, data_set_files dsf
-					WHERE ds.code = ? AND dsf.dase_id = ds.id
+					WHERE ds.code = ?{1} AND dsf.dase_id = ds.id
 				"""
 				
 """reporting table column names"""
@@ -23,13 +23,15 @@ def describe(dataSets, tableBuilder):
     tableBuilder.addHeader(LAST_MODIFIED)
     
     for dataSet in dataSets:
-        results = query_service.select(DATA_SOURCE, QUERY, dataSet.getDataSetCode()) 
+        results = queryService.select(DATA_SOURCE, QUERY, [dataSet.getDataSetCode()])
+        print "Found " + str(len(results)) + " results for data set '" + dataSet.getDataSetCode() + "':" 
         for r in results:
+            print r		# debugging
             row = tableBuilder.addRow()
-            row.setCell(DATA_SET_CODE, r.get("DATA_SET_CODE"))
-            row.setCell(RELATIVE_PATH, r.get("RELATIVE_PATH"))
-            row.setCell(FILE_NAME, r.get("FILE_NAME"))
-            row.setCell(SIZE_IN_BYTES, r.get("SIZE_IN_BYTES"))
-            row.setCell(IS_DIRECTORY, r.get("IS_DIRECTORY"))
-            row.setCell(LAST_MODIFIED, r.get("LAST_MODIFIED"))
+            row.setCell(DATA_SET_CODE, r.get("DATA_SET_CODE".lower()))
+            row.setCell(RELATIVE_PATH, r.get("RELATIVE_PATH".lower()))
+            row.setCell(FILE_NAME, r.get("FILE_NAME".lower()))
+            row.setCell(SIZE_IN_BYTES, r.get("SIZE_IN_BYTES".lower()))
+            row.setCell(IS_DIRECTORY, r.get("IS_DIRECTORY".lower()))
+            row.setCell(LAST_MODIFIED, r.get("LAST_MODIFIED".lower()))
         results.close()
\ No newline at end of file

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSourceQueryService.java

@@ -54,7 +54,8 @@ public interface IDataSourceQueryService
      * 
      * @param dataSourceName The name of the data source to query against, as declared in the
      *            service.properties file.
-     * @param query The SQL query to execute, possibly including parameters marked by '?'.
+     * @param query The SQL query to execute, possibly including parameters marked by '?{X}' where X
+     *            is the parameter number.
      * @return A List of Maps with the data. Do not forget to close the result when done!
      * @throw IllegalArgumentException Throws if there is no data source with the given name.
      * @throw InvalidQueryException Thrown the given query string cannot be parsed, or doesn't match
@@ -68,7 +69,8 @@ public interface IDataSourceQueryService
      * 
      * @param dataSourceName The name of the data source to query against, as declared in the
      *            service.properties file.
-     * @param query The SQL query to execute, possibly including parameters marked by '?'.
+     * @param query The SQL query to execute, possibly including parameters marked by '?{X}' where X
+     *            is the parameter number.
      * @param parameters The values for filling in the query parameters.
      * @return A List of Maps with the data. Do not forget to close the result when done!
      * @throw IllegalArgumentException Thrown if there is no data source with the given name.