Changeset 34988

Timestamp:

Jan 19, 2013, 6:54:38 AM (13 years ago)

Author:

eugene

Message:

add dvo.useStilts boolean and code to run dvopsps for skytable import

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/dvo.py (modified) (2 diffs)

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

@@ -46 +46 @@
         self.regionsIngestedButOutOfDate = []
        
+        # XXX use Stilts for ingest in certain cases or not?
+        self.useStilts = 0
+
         # connect to the specified scratch database
         try:
@@ -158 +161 @@
         self.logger.infoSeparator()
         self.logger.infoPair("DVO SkyTable.fits file", "NOT up-to-date")        
-        self.importFits(
+
+        if self.useStilts:
+            self.importFits(
                 path,
                 "R_MIN R_MAX D_MIN D_MAX INDEX NAME",
                 self.scratchDb.dvoSkyTable)
+        else:
+            
+            # create dvoSkyTable 
+            sql = "drop TABLE dvoSkyTable"
+            try:
+                self.scratchDb.execute(sql)
+            except: pass
+
+            # create dvoSkyTable 
+            sql = "CREATE TABLE dvoSkyTable (R_MIN REAL, R_MAX REAL, D_MIN REAL, D_MAX REAL, INDEX_ INT, NAME CHAR(18))"
+            self.scratchDb.execute(sql)
+
+            # TODO path to DVO prog hardcoded temporarily
+            cmd = "dvopsps skytable"
+            cmd += " -dbhost " + self.scratchDb.dbHost
+            cmd += " -dbname " + self.scratchDb.dbName
+            cmd += " -dbuser " + self.scratchDb.dbUser
+            cmd += " -dbpass " + self.scratchDb.dbPass
+            cmd += " -D CATDIR " + self.config.dvoLocation
+
+            self.logger.infoPair("Running dvopsps", cmd)
+            p = Popen(cmd, shell=True, stdout=PIPE)
+            p.wait()
 
         self.logger.infoPair("Adding index to", self.scratchDb.dvoSkyTable)