finished up data export

Author: kwuz

odmtools/odmservices/export_data.py

@@ -23,8 +23,14 @@ def export_series_data(self, series_id, filename, utc=False, site=False, var=Fal
         plainWriter.close()
         writer = csv.writer(open(filename, 'a'))
         self.write_data_header(writer, utc, site, var, offset, qual, src, qcl)
-        # for dv in series.data_values:
+        # for dv in self._series_service.get_values(series.ResultID):
         #     self.write_data_row(writer, series, dv, utc, site, var, offset, qual, src, qcl)
+        vals = self._series_service.get_values(series.ResultID)
+        vals.to_csv(filename, ',',
+                    columns = ['valuedatetime', 'valuedatetimeutcoffset', 'datavalue', 'censorcodecv', 'qualifiercodecv'],
+                    header = ['LocalDateTime', 'UTCOffset', series.VariableObj.VariableCode, 'CensorCode', 'QualifierCode'],
+                    mode = 'a',
+                    index = False)
 
     def export_data(self, series_ids, filename):
         if series_ids is None:

odmtools/odmservices/series_service.py

@@ -971,3 +971,12 @@ def delete_dvs(self, id_list):
             print message
             logger.error(message)
             raise ex
+
+    def get_values_by_series(self, series_id):
+        setSchema(self._session_factory.engine)
+        q = self.read._session.query(TimeSeriesResultValues)
+        if series_id:
+            q = q.filter_by(ResultID=series_id)
+        q = q.order_by(TimeSeriesResultValues.ValueDateTime)
+
+        return q.all()