update warning message

Author: sreeder

Examples/Sample.py

@@ -17,14 +17,14 @@
 #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('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
 
-# session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "ODM", "odm")#win MSSQL
 
+# 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
 
 # session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
-# session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/YODA-Tools/tests/test_files/XL_specimen.sqlite', 2.0)
+# session_factory = dbconnection.createConnection('sqlite', 'path/to/ODM2.sqlite', 2.0)
 
 
 
@@ -34,7 +34,7 @@
 read = ReadODM2(session_factory)
 create = CreateODM2(session_factory)
 
-
+sitetest = read.getResults(sfid = 1)
 
 
 
@@ -66,6 +66,7 @@
 try:
     print ("\n-------- Information about Sites ---------")
     siteFeatures = read.getSamplingFeatures(type= 'site')
+
     # siteFeatures = read.getSamplingFeatures(type='Site')
     numSites = len(siteFeatures)
     print ("Successful query")
@@ -149,7 +150,7 @@
 # Get the values for a particular TimeSeriesResult
 print("\n-------- Example of Retrieving Time Series Result Values ---------")
 
-tsValues = read.getResultValues(resultid = 1)  # Return type is a pandas datafram
+tsValues = read.getResultValues(resultids = [1])  # Return type is a pandas datafram
 
 # Print a few Time Series Values to the console
 # tsValues.set_index('ValueDateTime', inplace=True)

odm2api/ODM2/services/readService.py

@@ -671,7 +671,7 @@ def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationi
             query = query.join(FeatureActions).filter_by(ActionID=actionid)
         if sfid:
             import warnings
-            warnings.warn('the parameter sfid, will no longer be supported. please use the sfids parameter and send in a list. ')
+            warnings.warn("The parameter 'sfid' is no longer be supported. Please use the sfids parameter and send in a list.")
             query = query.join(FeatureActions).filter_by(SamplingFeatureID=sfid)
         if sfids or sfcodes or sfuuids:
             sf_list = self.getSamplingFeatures(ids=sfids, codes=sfcodes, uuids=sfuuids)
@@ -695,7 +695,7 @@ def getResults(self, ids=None, type=None, uuids=None, actionid=None, simulationi
             # sfids = []
             # for sf in sf_list:
             #     sfids.append(sf.SamplingFeatureID)
-            
+
             query = query.join(FeatureActions).filter(FeatureActions.SamplingFeatureID.in_(sfids))
 
         try:

tests/test_odm2/test_readservice.py

@@ -137,7 +137,6 @@ def test_getResultsBySFID(self):
 
         # get the result using the api
         resapi = self.reader.getResults(sfids=[sfid])
-
         assert resapi is not None
         assert len(resapi) > 0
         assert resapi[0].ResultID == res[0]