add condition to getDatasetREsults function

Author: sreeder

Examples/Sample.py

@@ -17,7 +17,7 @@
 #connect to database
 # createconnection (dbtype, servername, dbname, username, password)
 # session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
-session_factory = dbconnection.createConnection('postgresql', 'localhost', 'odm2', 'ODM', 'odm')
+# session_factory = dbconnection.createConnection('postgresql', 'localhost', 'odm2', 'ODM', 'odm')
 # session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
 
 # session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "ODM", "odm")#win MSSQL
@@ -27,6 +27,13 @@
 # session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/YODA-Tools/tests/test_files/XL_specimen.sqlite', 2.0)
 
 
+session_factory = dbconnection.createConnection('postgresql', 'odm2wofpy1.uwrl.usu.edu', 'odm2', 'dbadmin', 'pinkbananastastegross')
+
+
+
+
+
+
 
 
 

odm2api/ODM2/services/readService.py

@@ -732,6 +732,7 @@ def getDataSetsResults(self, ids= None, codes=None, uuids=None, dstype=None):
         Retrieve a detailed list of Datasets along with detailed metadata about the datasets
                 and the results contained within them
 
+        **Must specify either DataSetID OR DataSetUUID OR DataSetCode)**
         Args:
             ids (list, optional): List of DataSetsIDs.
             codes (list, optional): List of DataSet Codes.
@@ -752,6 +753,11 @@ def getDataSetsResults(self, ids= None, codes=None, uuids=None, dstype=None):
             >>> READ.getDataSetsResults(dstype='singleTimeSeries')
 
         """
+
+        # make sure one of the three arguments has been sent in
+        if all(v is None for v in [ids, codes, uuids]):
+            raise ValueError('Expected DataSetID OR DataSetUUID OR DataSetCode argument')
+
         q = self._session.query(DataSetsResults)\
             .join(DataSets)
         if ids: