update ODM switcher

Author: sreeder

src/Examples/Sample1_1.py

@@ -12,11 +12,11 @@
 
 #createconnection (dbtype, servername, dbname, username, password)
 #session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')
-session_factory = dbconnection.createConnection('mysql', 'jws.uwrl.usu.edu', 'odm2', 'ODM', 'ODM123!!', 2)
+# session_factory = dbconnection.createConnection('mysql', 'jws.uwrl.usu.edu', 'odm2', 'ODM', 'ODM123!!', 2)
 
 
 #ODM1 DB
-#conn = dbconnection.createConnection('mysql', 'jws.uwrl.usu.edu', 'odm', "ODM", "ODM123!!", 1.1)
+session_factory = dbconnection.createConnection('mysql', 'jws.uwrl.usu.edu', 'odm', "ODM", "ODM123!!", 1.1)
 
 pp = pprint.PrettyPrinter(indent=8)
 

src/api/ODM1_1_1/services/__init__.py

@@ -1,7 +1,11 @@
 __author__ = 'stephanie'
-from cv_service import CVService
-from series_service import SeriesService
+# from cv_service import CVService, refreshDB
+from series_service import refreshDB, ODM, SeriesService
 from edit_service import  EditService
 from export_service import ExportService
 
-__all__ = ['CVService', 'SeriesService', 'EditService', 'ExportService']
+__all__ = [ 'SeriesService', 'EditService', 'ExportService', 'ODM', 'refreshDB']
+# 'CVService',
+# def switch_service(version ):
+#     cv_service.refreshDB(version)
+#     series_service.refreshDB(version)

src/api/ODM1_1_1/services/cv_service.py

@@ -4,11 +4,24 @@
     alueTypeCV, DataTypeCV, GeneralCategoryCV, CensorCodeCV, TopicCategoryCV, SampleTypeCV, OffsetType, Sample, \
     Qualifier, Unit
 '''
-from ...versionSwitcher import ODM
+#from ...versionSwitcher import ODM
 from ...base import serviceBase
 from sqlalchemy import not_
 
 
+import ODM1_1_1.models as ODM1
+import ODM2.LikeODM1.models as ODM2
+
+#Set Default
+ODM = ODM2
+
+def refreshDB(ver):
+    if ver == 1.1:
+        ODM = ODM1
+    elif ver == 2.0:
+        ODM = ODM2
+
+
 class CVService(serviceBase):
 
 
@@ -22,9 +35,6 @@ def get_vertical_datum_cvs(self):
     def get_samples(self):
         result = self._session.query(ODM.Sample).order_by(ODM.Sample.lab_sample_code).all()
         return result
-
-
-
     def get_site_type_cvs(self):
         result = self._session.query(ODM.SiteTypeCV).order_by(ODM.SiteTypeCV.term).all()
         return result

src/api/ODM1_1_1/services/edit_service.py

@@ -1,6 +1,6 @@
 import sqlite3
 
-from ...versionSwitcher import ODM
+#from ...versionSwitcher import ODM
 from series_service import SeriesService
 
 #from odmtools.odmdata import series as series_module
@@ -16,6 +16,8 @@
 #logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
 
 
+
+
 class EditService():
     # Mutual exclusion: cursor, or connection_string
     def __init__(self, series_id, connection=None, connection_string="", debug=False):
@@ -459,7 +461,7 @@ def updateSeries(self, var=None, method=None, qcl=None, is_new_series=False):
         if is_new_series:
 
 
-            series = ODM.Series.copy_series(series)
+            series = self.memDB.series_service.copy_series(series)
 
 
             if var:

src/api/ODM1_1_1/services/series_service.py

@@ -1,16 +1,27 @@
 import logging
 
 
-from sqlalchemy import distinct, func
+from sqlalchemy import distinct, func, not_
 
 
-from ...ODMconnection import SessionFactory
-from ...versionSwitcher import ODM #.models import Site, Variable, Unit, Series, DataValue, Qualifier, OffsetType, Sample, Method, QualityControlLevel, ODMVersion
 from ...base import serviceBase
-
 import pandas as pd
 
 
+import api.ODM1_1_1.models as ODM1
+import api.ODM2.LikeODM1.models as ODM2
+
+#Set Default
+ODM = ODM2
+
+def refreshDB(ver):
+    if ver == 1.1:
+        ODM = ODM1
+    elif ver == 2.0:
+        ODM = ODM2
+
+
+
 
 
 class SeriesService(serviceBase):
@@ -538,7 +549,7 @@ def create_new_series(self, data_values, site_id, variable_id, method_id, source
         self._session.commit()
         return series
 
-    def create_method(self, description, link):
+    def create_method(self, description, link=None):
         """
 
         :param description:
@@ -769,4 +780,113 @@ def variable_exists(self, v):
                                                                   no_data_value=v.no_data_value).one()
             return result
         except:
-            return None
+            return None
+
+
+
+
+
+####CV_Service
+
+    def get_vertical_datum_cvs(self):
+        result = self._session.query(ODM.VerticalDatumCV).order_by(ODM.VerticalDatumCV.term).all()
+        return result
+
+    def get_samples(self):
+        result = self._session.query(ODM.Sample).order_by(ODM.Sample.lab_sample_code).all()
+        return result
+    def get_site_type_cvs(self):
+        result = self._session.query(ODM.SiteTypeCV).order_by(ODM.SiteTypeCV.term).all()
+        return result
+
+    def get_variable_name_cvs(self):
+        result = self._session.query(ODM.VariableNameCV).order_by(ODM.VariableNameCV.term).all()
+        return result
+
+    def get_offset_type_cvs(self):
+        result = self._session.query(ODM.OffsetType).order_by(ODM.OffsetType.id).all()
+        return result
+
+    def get_speciation_cvs(self):
+        result = self._session.query(ODM.SpeciationCV).order_by(ODM.SpeciationCV.term).all()
+        return result
+
+    def get_sample_medium_cvs(self):
+        result = self._session.query(ODM.SampleMediumCV).order_by(ODM.SampleMediumCV.term).all()
+        return result
+
+    def get_value_type_cvs(self):
+        result = self._session.query(ODM.ValueTypeCV).order_by(ODM.ValueTypeCV.term).all()
+        return result
+
+    def get_data_type_cvs(self):
+        result = self._session.query(ODM.DataTypeCV).order_by(ODM.DataTypeCV.term).all()
+        return result
+
+    def get_general_category_cvs(self):
+        result = self._session.query(ODM.GeneralCategoryCV).order_by(ODM.GeneralCategoryCV.term).all()
+        return result
+
+    def get_censor_code_cvs(self):
+        result = self._session.query(ODM.CensorCodeCV).order_by(ODM.CensorCodeCV.term).all()
+        return result
+
+    def get_sample_type_cvs(self):
+        result = self._session.query(ODM.SampleTypeCV).order_by(ODM.SampleTypeCV.term).all()
+        return result
+
+    def get_units(self):
+        result = self._session.query(ODM.Unit).all()
+        return result
+
+    def get_units_not_uni(self):
+        result = self._session.query(ODM.Unit).filter(not_(ODM.Unit.name.contains('angstrom'))).all()
+        return result
+
+    def get_units_names(self):
+        result = self._session.query(ODM.Unit.name).all()
+        return result
+
+    # return a single cv
+    def get_unit_by_name(self, unit_name):
+        result = self._session.query(ODM.Unit).filter_by(name=unit_name).first()
+        return result
+
+    def get_unit_by_id(self, unit_id):
+        result = self._session.query(ODM.Unit).filter_by(id=unit_id).first()
+        return result
+
+
+
+
+    def copy_series(from_series):
+        new = ODM.Series()
+        new.site_id = from_series.site_id
+        new.site_code = from_series.site_code
+        new.site_name = from_series.site_name
+        new.variable_id = from_series.variable_id
+        new.variable_code = from_series.variable_code
+        new.variable_name = from_series.variable_name
+        new.speciation = from_series.speciation
+        new.variable_units_id = from_series.variable_units_id
+        new.variable_units_name = from_series.variable_units_name
+        new.sample_medium = from_series.sample_medium
+        new.value_type = from_series.value_type
+        new.time_support = from_series.time_support
+        new.time_units_id = from_series.time_units_id
+        new.time_units_name = from_series.time_units_name
+        new.data_type = from_series.data_type
+        new.general_category = from_series.general_category
+        new.method_id = from_series.method_id
+        new.method_description = from_series.method_description
+        new.source_id = from_series.source_id
+        new.source_description = from_series.source_description
+        new.organization = from_series.organization
+        new.citation = from_series.citation
+        new.quality_control_level_id = from_series.quality_control_level_id
+        new.quality_control_level_code = from_series.quality_control_level_code
+        new.begin_date_time = from_series.begin_date_time
+        new.begin_date_time_utc = from_series.begin_date_time_utc
+        new.end_date_time_utc = from_series.end_date_time_utc
+        new.value_count = from_series.value_count
+        return new

src/api/ODM2/LikeODM1/__init__.py

@@ -62,7 +62,5 @@
     'Variable',
     'VariableNameCV',
     'VerticalDatumCV',
-    'MemoryDatabase',
-    'copy_series',
-    'copy_data_value'
+
 ]

src/api/ODMconnection.py

@@ -4,7 +4,8 @@
 from sqlalchemy.orm import sessionmaker
 
 from .ODM2.models import Variables as Variable2, change_schema
-from .versionSwitcher import ODM, refreshDB #import Variable as Variable1
+#from .versionSwitcher import ODM, refreshDB #import Variable as Variable1
+from .ODM1_1_1.services import ODM, refreshDB
 import urllib
 import sys
 

src/api/versionSwitcher.py

@@ -1,14 +1,14 @@
-__author__ = 'stephanie'
-
-import ODM1_1_1.models as ODM1
-import ODM2.LikeODM1.models as ODM2
-
-#Set Default
-ODM = ODM2
-
-def refreshDB(ver):
-    if ver == 1.1:
-        ODM = ODM1
-    elif ver == 2.0:
-        ODM = ODM2
-
+# __author__ = 'stephanie'
+#
+# import ODM1_1_1.models as ODM1
+# import ODM2.LikeODM1.models as ODM2
+#
+# #Set Default
+# ODM = ODM2
+#
+# def refreshDB(ver):
+#     if ver == 1.1:
+#         ODM = ODM1
+#     elif ver == 2.0:
+#         ODM = ODM2
+#