update sample to work with inheritance

Author: Stephanie Reeder

.gitignore

@@ -42,3 +42,4 @@ log
 .idea
 
 .DS_Store
+.ipynb_checkpoints

Examples/Sample.py

@@ -64,7 +64,7 @@
     numSites = len(siteFeatures)
 
     for x in siteFeatures:
-        print x.SamplingFeatureCode + ": " + x.SamplingFeatureName + ", " + x.SamplingFeatureTypeCV
+        print x.SamplingFeatureCode + ": " + str(x.SamplingFeatureName) + ", " + x.SamplingFeatureTypeCV
 except Exception as e:
     print "Unable to demo getSamplingFeaturesByType", e
 
@@ -127,20 +127,20 @@
 # Now get a particular Result using a ResultID
 print "\n------- Example of Retrieving Attributes of a Time Series Result -------"
 try:
-    tsResult = read.getResults(id = 1)
+    tsResult = read.getResults(id = 1)[0]
     print (
         "The following are some of the attributes for the TimeSeriesResult retrieved using getTimeSeriesResultByResultID(): \n" +
-        "ResultTypeCV: " + tsResult.ResultObj.ResultTypeCV + "\n" +
+        "ResultTypeCV: " + tsResult.ResultTypeCV + "\n" +
         # Get the ProcessingLevel from the TimeSeriesResult's ProcessingLevel object
-        "ProcessingLevel: " + tsResult.ResultObj.ProcessingLevelObj.Definition + "\n" +
-        "SampledMedium: " + tsResult.ResultObj.SampledMediumCV + "\n" +
+        "ProcessingLevel: " + tsResult.ProcessingLevelObj.Definition + "\n" +
+        "SampledMedium: " + tsResult.SampledMediumCV + "\n" +
         # Get the variable information from the TimeSeriesResult's Variable object
-        "Variable: " + tsResult.ResultObj.VariableObj.VariableCode + ": " + tsResult.ResultObj.VariableObj.VariableNameCV + "\n"
+        "Variable: " + tsResult.VariableObj.VariableCode + ": " + tsResult.VariableObj.VariableNameCV + "\n"
                                                                                                         "AggregationStatistic: " + tsResult.AggregationStatisticCV + "\n" +
         "Elevation_m: " + str(sf.Elevation_m) + "\n" +
         # Get the site information by drilling down
-        "SamplingFeature: " + tsResult.ResultObj.FeatureActionObj.SamplingFeatureObj.SamplingFeatureCode + " - " +
-        tsResult.ResultObj.FeatureActionObj.SamplingFeatureObj.SamplingFeatureName)
+        "SamplingFeature: " + tsResult.FeatureActionObj.SamplingFeatureObj.SamplingFeatureCode + " - " +
+        tsResult.FeatureActionObj.SamplingFeatureObj.SamplingFeatureName)
 except Exception as e:
     print "Unable to demo Example of retrieving Attributes of a time Series Result: ", e
 

odm2api/ODM2/services/readService.py

@@ -381,7 +381,7 @@ def getPeople(self, id=None, firstname=None, lastname=None):
         except:
             return None
 
-    def getAffiliations(self, id, personfirst=None, personlast=None, orgcode=None):
+    def getAffiliations(self, id=None, personfirst=None, personlast=None, orgcode=None):
         """
         Select all affiliation of person
         :param personfirst: first name of person
@@ -644,7 +644,7 @@ def getResultDerivationEquations(self):
     ResultValues
     """
 
-    def getResultValues(self, resultid=None, starttime=None, endtime=None):
+    def getResultValues(self, resultid, starttime=None, endtime=None):
 
         """Select all on TimeSeriesResults
         getResultValues()
@@ -656,33 +656,13 @@ def getResultValues(self, resultid=None, starttime=None, endtime=None):
 
 
         """
-        type = self._session.query(Results).filter_by(ResultID=resultid).first().ResultTypeCV
-        Result = TimeSeriesResults
-
-        if "categorical" in type.lower():
-            Result = CategoricalResultValues
-        elif "measurement" in type.lower():
-            Result = MeasurementResultValues
-        elif "coverage" in type.lower():
-            Result = PointCoverageResultValues
-        elif "profile" in type.lower():
-            Result = ProfileResultValues
-        elif "section" in type.lower():
-            Result = SectionResults
-        elif "spectra" in type.lower():
-            Result = SpectraResultValues
-        elif "time" in type.lower():
-            Result = TimeSeriesResultValues
-        elif "trajectory" in type.lower():
-            Result = TrajectoryResultValues
-        elif "transect" in type.lower():
-            Result = TransectResultValues
-
-        q = self._session.query(Result).filter_by(ResultID=id)
-        if starttime: q = q.filter(Result.ValueDateTime >= starttime)
-        if endtime: q = q.filter(Result.ValueDateTime <= endtime)
+
+
+        q = self._session.query(Results).filter_by(ResultID=id)
+        if starttime: q = q.filter(Results.ValueDateTime >= starttime)
+        if endtime: q = q.filter(Results.ValueDateTime <= endtime)
         try:
-            q = q.order_by(Result.ValueDateTime).all()
+            q = q.order_by(Results.ValueDateTime).all()
             df = pd.DataFrame([dv.list_repr() for dv in q.all()])
             df.columns = q[0].get_columns()
             return df