have create_service return object

Author: stephanie

Examples/Sample.py

@@ -2,8 +2,8 @@
 
 
 
-import matplotlib.pyplot as plt
-from matplotlib import dates
+# import matplotlib.pyplot as plt
+
 
 
 
@@ -17,9 +17,9 @@
 #connect to database
 # createconnection (dbtype, servername, dbname, username, password)
 # session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
-# session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
+session_factory = dbconnection.createConnection('mysql', 'arroyo.uwrl.usu.edu', 'odm2', 'ODM', 'odm')#mysql
 # session_factory= dbconnection.createConnection('mssql', "(local)", "LBRODM2", "ODM", "odm")#win MSSQL
-session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
+# session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
 # session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/ODM2/usecases/WOF_to_ODM2/ODM2.sqlite', 2.0)
 
 

Forms/clsDBConfig.py

@@ -115,6 +115,9 @@ def __init__( self, parent ):
 		self.btnTest.Bind( wx.EVT_BUTTON, self.OnBtnTest )
 		self.btnSave.Bind( wx.EVT_BUTTON, self.OnBtnSave )
 		self.btnCancel.Bind( wx.EVT_BUTTON, self.OnBtnCancel )
+
+		self.btnTest.SetFocus()
+
 
 	def __del__( self ):
 		pass

Forms/frmDBConfig.py

@@ -78,6 +78,7 @@ def validateInput(self, conn_dict):
             if self.service_manager.test_connection(conn_dict):
                 message = "This connection is valid"
                 wx.MessageBox(message, 'Test Connection', wx.OK)
+                self.btn
             else:
                 #TODO add error message if user cannont connect to the database ( not using VPN) but the db is still 1.1.1)
                 if not (self.service_manager.get_db_version(conn_dict)):

odm2api/ODM2/services/createService.py

@@ -27,75 +27,95 @@ def create(self, values):
     def createVariable(self, var):
         self._session.add(var)
         self._session.commit()
+        return var
 
     def createMethod(self, method):
         self._session.add(method)
         self._session.commit()
+        return method
 
     def createProcessingLevel(self, proclevel):
         self._session.add(proclevel)
         self._session.commit()
+        return proclevel
 
     def createSamplingFeature(self, samplingfeature):
         self._session.add(samplingfeature)
         self._session.commit()
+        return samplingfeature
 
     def createUnit(self, unit):
         self._session.add(unit)
         self._session.commit()
+        return unit
 
     def createOrganization(self, org):
         self._session.add(org)
         self._session.commit()
+        return org
 
     def createPerson(self, person):
         self._session.add(person)
         self._session.commit()
+        return person
 
     def createAffiliation(self, affiliation):
         self._session.add(affiliation)
         self._session.commit()
+        return affiliation
 
     def createDataset(self, dataset):
         self._session.add(dataset)
         self._session.commit()
+        return dataset
 
     def createDatasetResults(self, datasetresult):
         self._session.add(datasetresult)
         self._session.commit()
+        return datasetresult
 
     def createAction(self, action, actionby):
         self._session.add(action)
+        actionby.ActionID =  action.ActionID
         self._session.add(actionby)
         self._session.commit()
+        return action
+
 
     def createRelatedAction(self, relatedaction):
         self._session.add(relatedaction)
         self._session.commit()
+        return relatedaction
 
     def createResult(self, result):
         self._session.add(result)
         self._session.commit()
+        return result
 
     def createResultValues(self, values):
-        self._session.add(values)
+        self._session.add_all(values)
         self._session.commit()
+        return values
 
     def createSpatialReference(self, spatialref):
         self._session.add(spatialref)
         self._session.commit()
+        return spatialref
 
     def createModel(self, model):
         self._session.add(model)
         self._session.commit()
+        return model
 
     def createRelatedModel(self, relatedmodel):
         self._session.add(relatedmodel)
         self._session.commit()
+        return relatedmodel
 
     def createSimulation(self, simulation):
         self._session.add(simulation)
         self._session.commit()
+        return simulation
 
     def createTimeSeriesResultValues(self, datavalues):
         try: