Changeset 35063 for branches/eam_branches/ipp-20121219/ippToPsps/jython/loader.py

Timestamp:

Jan 27, 2013, 5:58:25 AM (14 years ago)

Author:

eugene

Message:

enable test mode from command-line (-test, after jython module); add parallel dvo option; make database selection more consistent and variable on test/not-test

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/loader.py (modified) (1 diff)

branches/eam_branches/ipp-20121219/ippToPsps/jython/loader.py

@@ -34 +34 @@
         super(Loader, self).__init__(argv, 1, 1)
 
-        # create gpc1 database objects
+        if self.config.parallel:
+            print "PARALLEL dvo"
+        else: 
+            print "SERIAL dvo"
+
+        # connect to the gpc1 database
         self.gpc1Db = Gpc1Db(self.logger, self.config)
 
-        # XXX this is really bad: need to get these from config... (see this code:)
-        ## XX # open config and grab database parameters
-        ## XX if not dbName: self.dbName = config.getDbName(dbType)
-        ## XX else: self.dbName = dbName
-
         # connect to scratch database
-        scratchDbs = ['ipptopsps_test_scratch', 'ipptopsps_test_scratch2', 'ipptopsps_test_scratch3']
-        for dbName in scratchDbs:
-            self.scratchDb = ScratchDb(self.logger, self.config, dbName)
-            if self.scratchDb.anyOtherConnections():
-                self.logger.errorPair("This scratch Db is already in use", dbName)
+        scratchDbs = ['1', '2', '3']
+        for dbVersion in scratchDbs:
+            self.scratchDb = ScratchDb(self.logger, self.config, dbVersion)
+            if not self.config.test and self.scratchDb.anyOtherConnections():
+                self.logger.errorPair("This scratch Db is already in use", self.scratchDb.dbName)
                 self.scratchDb.disconnect()
                 continue