Changeset 38995 for trunk/ippToPsps/jython/dvo.py

Timestamp:

Oct 28, 2015, 8:29:33 PM (11 years ago)

Author:

eugene

Message:

add -stilts option; fix stilts and regex for detectionbatch; add tableprefix option for stacks; alter photcode.type to type_as_int

File:

• trunk/ippToPsps/jython/dvo.py (modified) (2 diffs)

trunk/ippToPsps/jython/dvo.py

@@ -590 +590 @@
     '''
     def importPhotcodes(self, path, tableName):
-        if True:
+        if self.config.useOhanaMYSQLtoFITS:
             self.importPhotcodesOhana(path,tableName)
         else:
@@ -607 +607 @@
       # table = stilts.tpipe(table, cmd='addcol -after TYPE TYPE_AS_INT "TYPE + 0"')
 
-      self.scratchDb.loadFITStoMYSQL (path, tableName)
+      self.scratchDb.loadFITStoMYSQL (path, "-tablename " + tableName)
+
+      sql = "ALTER TABLE " + tableName + " ADD COLUMN TYPE_AS_INT INT AFTER TYPE"
+      self.scratchDb.execute(sql)
+
+      sql = "UPDATE " + tableName + " SET TYPE_AS_INT = ascii(TYPE)"
+      self.scratchDb.execute(sql)
 
       self.logger.debugPair("Finished importing", tableName)