adding getters for sdl

Author: denvaar

src/api/ODM2/models.py

@@ -173,7 +173,7 @@ class CVMediumType(Base):
     Category = Column('category', String(255))
     SourceVocabularyUri = Column('sourcevocabularyuri', String(255))
     def __repr__(self):
-        return "<CVMedium('%s', '%s', '%s', '%s')>" %(self.Term, self.name, self.Definition, self.Category)
+        return "<CVMedium('%s', '%s', '%s', '%s')>" %(self.Term, self.Name, self.Definition, self.Category)
 
 class CVMethodType(Base):
     __tablename__ = 'cv_methodtype'

src/api/ODM2/services/createService.py

@@ -471,10 +471,11 @@ def createTimeSeriesResultValues(self, datavalues):
             #changing way values sent --unknown error on insert
             #cols = datavalues.columns.tolist()
             #['ValueDateTime', 'DataValue', 'TimeAggregationInterval', 'TimeAggregationIntervalUnitsID', 'QualityCodeCV', 'CensorCodeCV', 'ResultID', 'ValueDateTimeUTCOffset']
-            cols = ['ResultID','DataValue','ValueDateTime','ValueDateTimeUTCOffset','CensorCodeCV','QualityCodeCV','TimeAggregationInterval','TimeAggregationIntervalUnitsID']
-            datavalues = datavalues[cols]
+            #cols = ['ResultID','DataValue','ValueDateTime','ValueDateTimeUTCOffset','CensorCodeCV','QualityCodeCV','TimeAggregationInterval','TimeAggregationIntervalUnitsID']
+            #datavalues = datavalues[cols]
             #print datavalues
-            datavalues.to_sql(name=TimeSeriesResultValues.__tablename__,
+            #datavalues.to_sql(name=TimeSeriesResultValues.__tablename__,
+            datavalues.to_sql(name="TimeSeriesResultValues",
                               schema=TimeSeriesResultValues.__table_args__['schema'],
                               if_exists='append',
                               chunksize= 1000,

src/api/ODM2/services/readService.py

@@ -138,6 +138,24 @@ def getCVMethodTypes(self):
         Select all on CVMethodType
         """
         return self._session.query(CVMethodType).all()
+    
+    def getCVMediumTypes(self):
+        """
+        Select all on CVMediumType
+        """
+        return self._session.query(CVMediumType).all()
+    
+    def getCVAggregationStatistics(self):
+        """
+        Select all on CVAggregationStatistic
+        """
+        return self._session.query(CVAggregationStatistic).all()
+    
+    def getCVStatus(self):
+        """
+        Select all on CVStatus
+        """
+        return self._session.query(CVStatus).all()
 
 # ################################################################################
 # Core

src/api/ODMconnection.py

@@ -192,4 +192,4 @@ def __buildConnectionString(self, conn_dict):
                 conn_dict['db'])
 
         print "******", conn_string
-        return conn_string
+        return conn_string