Merge branch 'master' of https://github.com/ODM2/ODMToolsPython

Author: sreeder

odmtools/controller/logicEditTools.py

@@ -126,7 +126,7 @@ def _dataframe2liststub(self, dataframe):
         result = None
         if isinstance(dataframe, pd.DataFrame):
             result = pd.DataFrame()
-
+#TODO update function recieves a dataframe  extract "datavalues" and "localdatetime" convert to dictionary call update function from memory database
 
         ## return dataframe
 

odmtools/odmservices/edit_service.py

@@ -271,7 +271,6 @@ def duplicate_value_filter(self):
         #self.filtered_dataframe= df[df.index.get_duplicates()]
         self.filtered_dataframe= df[df.index.isin(df.index.get_duplicates())]
         #self.filtered_dataframe = df[df['DataValue'] < value]
-        print "dup value worked"
 
 
     def select_points_tf(self, tf_list):
@@ -411,7 +410,6 @@ def interpolate(self):
 
     def drift_correction(self, gap_width):
 
-
         if self.isOneGroup():
             tmp_filter_list =self.get_filtered_points()
             startdate =tmp_filter_list.index[0]

odmtools/odmservices/export_data.py

@@ -0,0 +1,35 @@
+import csv
+import xml.etree.cElementTree as ET
+import datetime
+
+class ExportData():
+
+    def __init__(selfself, series_service):
+        self._series_service = series_service
+        self.dt_format_str = "%m/%d/%Y %I:%M:%S %p"
+
+    def export_series_data(self, series_id, filename, utc=False, site=False, var=False, offset=False, qual=False,
+                           src=False, qcl=False):
+        series = self._series_service.get_series_by_id(series_id)
+        if series is None:
+            return False
+
+        writer = csv.writer(open(filename, 'wb'))
+        print "filename: ". filename
+        self.write_data_header(writer, utc, site, var, offset, qual, src, qcl)
+        for dv in series.data_values:
+            self.write_data_row(writer, series, dv, utc, site, var, offset, qual, src, qcl)
+
+    def export_data(self, series_ids, filename):
+        if series_ids is None:
+            return
+
+        try:
+            with open(filename):
+                file_exists = True
+        except IOError:
+            file_exists = False
+
+        if file_exists:
+            pass
+            

odmtools/odmservices/export_service.py

@@ -212,9 +212,9 @@ def append_site_info(self, series, parent):
         local_y = ET.SubElement(local_coords, "LocalY")
         local_y.text = str(site.local_y)
         local_srs_id = ET.SubElement(local_coords, "SRSID")
-        local_srs_id.text = str(site.local_spatial_ref.srs_id)
-        local_srs_name = ET.SubElement(local_coords, "SRSName")
-        local_srs_name.text = site.local_spatial_ref.srs_name
+#        local_srs_id.text = str(site.local_spatial_ref.srs_id)
+ #       local_srs_name = ET.SubElement(local_coords, "SRSName")
+  #      local_srs_name.text = site.local_spatial_ref.srs_name
         local_is_geo = ET.SubElement(local_coords, "IsGeographic")
         local_is_geo.text = str(site.local_spatial_ref.is_geographic)
         local_notes = ET.SubElement(local_coords, "Notes")