update conda channels in appveyor

Author: stephanie

Examples/Sample.py

@@ -89,13 +89,13 @@
     # from odm2api.ODM2.models import SamplingFeatures
     session = session_factory.getSession()
     newsf = Sites(FeatureGeometryWKT = "POINT(-111.946 41.718)", Elevation_m=100, ElevationDatumCV=sf.ElevationDatumCV,
-    SamplingFeatureCode= "TestSF",SamplingFeatureDescription = "this is a test to add Feature Geomotry",
-    SamplingFeatureGeotypeCV= "Point", SamplingFeatureTypeCV=sf.SamplingFeatureTypeCV,SamplingFeatureUUID= sf.SamplingFeatureUUID+"3",
+    SamplingFeatureCode= "TestSF",SamplingFeatureDescription = "this is a test in sample.py",
+    SamplingFeatureGeotypeCV= "Point", SamplingFeatureTypeCV=sf.SamplingFeatureTypeCV,SamplingFeatureUUID= sf.SamplingFeatureUUID+"2",
     SiteTypeCV="cave", Latitude= "100", Longitude= "-100", SpatialReferenceID= 0)
 
-    create.createSamplingFeature(newsf)
+    c=create.createSamplingFeature(newsf)
     #session.commit()
-    print("new sampling feature added to database", newsf)
+    print("new sampling feature added to database", c)
 
 except Exception as e :
     print("error adding a sampling feature: " + str(e))

appveyor.yml

@@ -8,8 +8,9 @@ environment:
     MINICONDA_VERSION: "latest"
     #    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers/appveyor/windows_sdk.cmd"
-    CONDA_DEPENDENCIES: "scipy pandas seaborn sqlalchemy pymysql "
-    PIP_DEPENDENCIES: "shapely,pyodbc,pytest,psycopg2"
+    CONDA_CHANNELS: "ODM2"
+    CONDA_DEPENDENCIES: "scipy pandas seaborn sqlalchemy pymysql geoalchemy-odm2 shapely psycopg2"
+    PIP_DEPENDENCIES: "pyodbc,pytest"
     #,-e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
 
 

odm2api/ODM2/services/createService.py

@@ -83,16 +83,16 @@ def createDatasetResults(self, datasetresult):
 
         return datasetresult
 
-    def createAction(self, action, actionby):
+    def createAction(self, action):
         self._session.add(action)
-
-        self._session.commit()
-        self._session.flush()
-        actionby.ActionID = action.ActionID
-        self._session.add(actionby)
         self._session.commit()
         return action
 
+    def createActionby(self, actionby):
+
+        self._session.add(actionby)
+        self._session.commit()
+        return actionby
 
     def createRelatedAction(self, relatedaction):
         self._session.add(relatedaction)

odm2api/ODM2/services/readService.py

@@ -9,19 +9,19 @@
 
 class DetailedResult:
     def __init__(self, result,
-                 samplingFeature,
+                 sc, sn,
                  method, variable,
                  processingLevel,
                  unit):
         # result.result_id etc.
         self.resultID = result.ResultID
-        self.samplingFeatureCode = samplingFeature#.SamplingFeatureCode
+        self.samplingFeatureCode = sc#.SamplingFeatureCode
         self.methodCode = method.MethodCode
         self.variableCode = variable.VariableCode
         self.processingLevelCode = processingLevel.ProcessingLevelCode
         self.unitsName = unit.UnitsName
 
-        self.samplingFeatureName = samplingFeature#.SamplingFeatureName
+        self.samplingFeatureName = sn#.SamplingFeatureName
         self.methodName = method.MethodName
         self.variableNameCV = variable.VariableNameCV
         self.processingLevelDef = processingLevel.Definition
@@ -170,7 +170,7 @@ def getDetailedAffiliationInfo(self):
         return affiliationList
 
     def getDetailedResultInfo(self, resultTypeCV, resultID=None):
-        q = self._session.query(Results, SamplingFeatures.SamplingFeatureCode, Methods, Variables,
+        q = self._session.query(Results, SamplingFeatures.SamplingFeatureCode, SamplingFeatures.SamplingFeatureName, Methods, Variables,
                                 ProcessingLevels, Units).filter(Results.VariableID == Variables.VariableID) \
             .filter(Results.UnitsID == Units.UnitsID) \
             .filter(Results.FeatureActionID == FeatureActions.FeatureActionID) \
@@ -181,14 +181,14 @@ def getDetailedResultInfo(self, resultTypeCV, resultID=None):
             .filter(Results.ResultTypeCV == resultTypeCV)
         resultList = []
         if resultID:
-            for r, s, m, v, p, u in q.filter_by(ResultID=resultID).all():
+            for r, sc, sn, m, v, p, u in q.filter_by(ResultID=resultID).all():
                 detailedResult = DetailedResult( \
-                    r, s, m, v, p, u)
+                    r, sc, sn, m, v, p, u)
                 resultList.append(detailedResult)
         else:
-            for r, s, m, v, p, u in q.all():
+            for r, sc, sn, m, v, p, u in q.all():
                 detailedResult = DetailedResult( \
-                    r, s, m, v, p, u)
+                    r, sc, sn, m, v, p, u)
                 resultList.append(detailedResult)
         return resultList
 
@@ -466,7 +466,8 @@ def getResults(self, ids=None, uuids= None,  actionid=None, simulationid = None)
 
         try:
             return query.all()
-        except:
+        except Exception as e:
+            print("Error running Query: %s" % e)
             return None
 
     #