Changeset 35097 for trunk/ippToPsps/jython/objectbatch.py

Timestamp:

Feb 6, 2013, 3:16:35 PM (13 years ago)

Author:

eugene

Message:

upgrade to ippToPsps (see doc/upgrade.txt): adds native dvo to mysql ingest operations, adds autogen configuration & installation, splits out global config information from new "skychunk" information (current region on the sky being processed), adds test suites

Location:

trunk/ippToPsps

Files:

• . (modified) (1 prop)
• jython (modified) (1 prop)
• jython/objectbatch.py (modified) (5 diffs)

trunk/ippToPsps/jython

@@ -1 +1 @@
 *.class
+Makefile
+Makefile.in

@@ -1 +1 @@
 *.class
+Makefile
+Makefile.in

trunk/ippToPsps/jython/objectbatch.py

@@ -32 +32 @@
                  logger, 
                  config,
+                 skychunk,
                  gpc1Db,
                  ippToPspsDb,
@@ -42 +43 @@
                logger,
                config,
+               skychunk,
                gpc1Db,
                ippToPspsDb,
@@ -52 +54 @@
 
        try:
-           self.dvoObjects = DvoObjects(self.logger, self.config, self.scratchDb.dbName)
+           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb.dbName)
        except:
            self.logger.errorPair("Unable to create instance of", "DvoObjects")
@@ -71 +73 @@
         self.region = self.scratchDb.getRegionNameFromThisDvoIndex(self.id)
         self.ippToPspsDb.insertObjectMeta(self.batchID, self.region)
-        self.dvoObjects.ingestRegion(self.region)
+        if True:
+            self.dvoObjects.nativeIngestRegion(self.region)
+        else:
+            self.dvoObjects.ingestRegion(self.region)
 
         return True
@@ -261 +266 @@
                ,PSF_QF_PERF \
                ,STARGAL_SEP \
-               , " + str(self.config.dataRelease) + "\
+               , " + str(self.skychunk.dataRelease) + "\
                , RAND() \
                FROM " + cptTableName

@@ -1 +1 @@
 *.class
+Makefile
+Makefile.in