merge

Author: Stephanie Reeder

src/Examples/Sample.py

@@ -13,15 +13,16 @@
 print directory
 sys.path.insert(0, directory)
 
-from src.api.ODMconnection import dbconnection
-from src.api.ODM2.services.readService import *
+from api.ODMconnection import dbconnection
+from api.ODM2.services.readService import *
 # Create a connection to the ODM2 database
 # ----------------------------------------
 
 
 #connect to database
 #createconnection (dbtype, servername, dbname, username, password)
-session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')
+#session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')
+session_factory = dbconnection.createConnection('mysql', 'jws.uwrl.usu.edu', 'odm2', 'ODM', 'ODM123!!', 2)
 
 
 
@@ -76,6 +77,26 @@
 except Exception as e:
     print "Unable to demo getSamplingFeatureByCode: ", e
 
+#add sampling feature
+try:
+    from api.ODM2.models import SamplingFeatures
+    newsf = SamplingFeatures()
+    newsf = SamplingFeatures()
+    newsf.FeatureGeometry = sf.FeatureGeometry
+    newsf.Elevation_m=100
+    newsf.ElevationDatumCV=sf.ElevationDatumCV
+    newsf.SamplingFeatureCode= "TestSF"
+    newsf.SamplingFeatureDescription = "this is a test to add Feature Geomotry"
+    newsf.SamplingFeatureGeotypeCV= sf.SamplingFeatureGeotypeCV
+    newsf.SamplingFeatureTypeCV=sf.SamplingFeatureTypeCV
+    newsf.SamplingFeatureUUID= sf.SamplingFeatureUUID+"1"
+    session_factory.getSession().add(newsf)
+    session_factory.getSession().commit()
+    print "new sampling deature added to database", newsf
+
+except Exception as e :
+    print "error adding a sampling feature" + e
+
 
 # Drill down and get objects linked by foreign keys
 print "\n------------ Foreign Key Example --------- \n",

src/api/Demo_likeODM1.py src/Examples/Sample1_1.pysrc/api/Demo_likeODM1.py renamed to src/Examples/Sample1_1.py

@@ -1,25 +1,22 @@
-import sys
-import os
-from src.api.ODMconnection import dbconnection
-import pprint
-from src.api.ODM1_1_1.services import SeriesService
+__author__ = 'stephanie'
 
-this_file = os.path.realpath(__file__)
-directory = os.path.dirname(this_file)
-sys.path.insert(0, directory)
+import matplotlib.pyplot as plt
+from matplotlib import dates
+import pprint
+from api.ODMconnection import dbconnection
+from api.ODM1_1_1.services import SeriesService
 
 
 # Create a connection to the ODM2 database
 # ----------------------------------------
-# conn = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'ODM123!!')
-# conn = dbconnection.createConnection('mysql', 'jws.uwrl.usu.edu', 'odm2', 'ODM', 'ODM123!!', 2.0)
-# conn = dbconnection.createConnection('mssql', '(local)', 'ODM2SS', 'ODM', 'odm')
-# conn = dbconnection.createConnection('postgresql', 'localhost', 'ODM2', 'odm', 'odm')
-# conn = dbconnection.createConnection('mysql', '127.0.0.1:3306', 'ODM2', 'Stephanie', 'odm')
-# -------------------------------------------------
+
+#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)
+
 
 #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)
 
@@ -29,8 +26,8 @@
 print "************************************************"
 print
 
-odm1service = SeriesService(conn)
-pp.pprint(conn)
+odm1service = SeriesService(session_factory)
+pp.pprint(session_factory)
 
 print
 print "************************************************"
@@ -79,7 +76,7 @@
 print "************************************************"
 print
 
-#pp.pprint(odm1service.get_all_series())
+pp.pprint(odm1service.get_all_series())
 
 
 print
@@ -88,7 +85,5 @@
 print "************************************************"
 print
 
-#pp.pprint(odm1service.get_values_by_series(1))
-
+pp.pprint(odm1service.get_values_by_series(1))
 
-#