update 1.1 version switching

Author: Stephanie Reeder

src/Examples/Sample1_1.py

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

src/api/ODM1_1_1/services/__init__.py

@@ -12,21 +12,22 @@
 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
-
-
+global ODM
+ODM = ODM1
 
 
 
 class SeriesService(serviceBase):
     # Accepts a string for creating a SessionFactory, default uses odmdata/connection.cfg
 
+    def refreshDB(self, ver):
+        self._version= ver
+        if ver == 1.1:
+            global ODM
+            ODM = ODM1
+        elif ver == 2.0:
+            global ODM
+            ODM = ODM2
 
     def reset_session(self):
         self._session = self._session_factory.getSession()  # Reset the session in order to prevent memory leaks
@@ -48,7 +49,6 @@ def get_all_sites(self):
         """
         return self._session.query(ODM.Site).order_by(ODM.Site.code).all()
 
-
     def get_used_sites(self):
         """
         Return a list of all sites that are being referenced in the Series Catalog Table
@@ -857,8 +857,6 @@ def get_unit_by_id(self, unit_id):
         return result
 
 
-
-
     def copy_series(from_series):
         new = ODM.Series()
         new.site_id = from_series.site_id

src/api/ODM1_1_1/services/cv_service.py

@@ -207,12 +207,15 @@ class Source(Base):
     @property
     def city(self):
         return "Unknown"
+
     @property
     def state(self):
         return "Unknown"
+
     @property
     def zip_code(self):
         return "Unknown"
+
     @property
     def citation(self):
         return "Not Specified"
@@ -410,7 +413,7 @@ class Sample(Base):
     lab_method_id = Column('labmethodid', Integer, ForeignKey(LabMethod.id), nullable=False)
 
     # relationships
-    #lab_method = relationship(LabMethod)
+    lab_method = relationship(LabMethod, primaryjoin = lab_method_id==LabMethod.id)
 
     def __repr__(self):
         return "<Sample('%s', '%s', '%s', '%s')>" % (self.id, self.type, self.lab_sample_code, self.lab_method_id)
@@ -437,7 +440,7 @@ class OffsetType(Base):
     description = Column('offsetdescription', String)
 
     # relationships
-    unit = relationship(Unit)
+    unit = relationship(Unit, primaryjoin =unit_id==Unit.id)
 
     def __repr__(self):
         return "<Unit('%s', '%s', '%s')>" % (self.id, self.unit_id, self.description)
@@ -524,15 +527,15 @@ def date_time_utc(cls):
 
 
     # relationships
-    # site = relationship(Site)
-    # variable = relationship(Variable)
-    # method = relationship(Method)
-    # source = relationship(Source)
-    # quality_control_level = relationship(QualityControlLevel)
-    #
-    # qualifier = relationship(Qualifier)
-    # offset_type = relationship(OffsetType)
-    # sample = relationship(Sample)
+    # site = relationship(Site, primaryjoin = site_id==Site.id)
+    variable = relationship(Variable, primaryjoin =variable_id==Variable.id)
+    # method = relationship(Method,primaryjoin =method_id == Method.id)
+    source = relationship(Source, primaryjoin =source_id == Source.id)
+    # quality_control_level = relationship(QualityControlLevel, primaryjoin =quality_control_level_id==QualityControlLevel.id)
+
+    # qualifier = relationship(Qualifier, primaryjoin =qualifier_id==Qualifier.id)
+    # offset_type = relationship(OffsetType, primaryjoin =offset_type_id==OffsetType.id)
+    # sample = relationship(Sample, primaryjoin =sample_id == Sample.id)
 
     def list_repr(self):
         return [self.id, self.data_value, self.value_accuracy, self.local_date_time,
@@ -637,9 +640,12 @@ class Series(Base):
     # begin_date_time_utc = None  # Column('BeginDateTimeUTC', DateTime)
     # end_date_time_utc = None  # Column('EndDateTimeUTC', DateTime)
     utc_offset= -7#joined_table_2.c.odm2_timeseriesresultvalues_valuedatetimeutcoffset
+
     @property
     def begin_date_time_utc(cls):
-        return cls.begin_date_time - timedelta(hours=cls.utc_offset)
+        val=cls.begin_date_time - timedelta(hours=cls.utc_offset)
+        return val
+
     @property
     def end_date_time_utc(cls):
         return cls.end_date_time - timedelta(hours=cls.utc_offset)
@@ -654,11 +660,11 @@ def end_date_time_utc(cls):
     #                            order_by="DataValue.local_date_time",
     #                            backref="series")
     #
-    # site = relationship(Site)
-    # variable = relationship(Variable)
-    # method = relationship(Method)
-    # source = relationship(Source)
-    # quality_control_level = relationship(QualityControlLevel)
+    # site = relationship(Site, primaryjoin = site_id==Site.id)
+    variable = relationship(Variable, primaryjoin= variable_id == Variable.id)
+    # method = relationship(Method, primaryjoin= method_id ==Method.id)
+    # source = relationship(Source, primaryjoin= source_id ==Source.id)
+    # quality_control_level = relationship(QualityControlLevel, primaryjoin = quality_control_level_id==QualityControlLevel.id)
 
     # TODO add all to repr
     def __repr__(self):

src/api/ODM1_1_1/services/series_service.py

@@ -5,13 +5,13 @@
 
 from .ODM2.models import Variables as Variable2, change_schema
 #from .versionSwitcher import ODM, refreshDB #import Variable as Variable1
-from .ODM1_1_1.services import ODM, refreshDB
+from .ODM1_1_1.services import ODM#, refreshDB
 import urllib
 import sys
 
 
 class SessionFactory():
-    def __init__(self, connection_string, echo):
+    def __init__(self, connection_string, echo, version = 1.1):
         if 'sqlite' in connection_string:
             self.engine = create_engine(connection_string, encoding='utf-8', echo=echo)
             self.test_engine = self.engine
@@ -25,6 +25,7 @@ def __init__(self, connection_string, echo):
         # Create session maker
         self.Session = sessionmaker(bind=self.engine)
         self.test_Session = sessionmaker(bind=self.test_engine)
+        self.version=version
 
     def getSession(self):
         return self.Session()
@@ -50,13 +51,13 @@ def createConnection(self, engine, address, db=None, user=None, password=None, d
         # if self.testConnection(connection_string):
 
         if self.isValidConnection(connection_string, dbtype):
-            return SessionFactory(connection_string, echo = False)
+            return SessionFactory(connection_string, echo = False, version= dbtype)
         else :
             return None
 
     @classmethod
     def isValidConnection(self, connection_string, dbtype):
-        refreshDB(dbtype)
+        #refreshDB(dbtype)
 
         if dbtype == 2.0:
             if self.testEngine(connection_string):
@@ -89,8 +90,6 @@ def _setSchema(self, engine):
         s = self._getSchema(engine)
         change_schema(s)
 
-
-
     @classmethod
     def testEngine(self, connection_string):
         s = SessionFactory(connection_string, echo=False)