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

Timestamp:

Oct 28, 2015, 7:55:59 AM (11 years ago)

Author:

eugene

Message:

enable ohana fits_to_mysql

File:

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

trunk/ippToPsps/jython/dvo.py

@@ -589 +589 @@
     Imports the Photcode file
     '''
+    def importPhotcodes(self, path, tableName):
+        if True:
+            self.importPhotcodesOhana(path,tableName)
+        else:
+            self.importPhotcodesStilts(path,tableName)
+
+    '''
+    Imports the Photcode file
+    '''
     def importPhotcodesOhana(self, path, tableName):
 
-      self.logger.infoPair("Importing file", "%s (%s)" % (path, self.getFileSizeStr(self.getDiskSize(path))))
+      self.logger.infoPair("Importing file with ohana", "%s (%s)" % (path, self.getFileSizeStr(self.getDiskSize(path))))
       self.logger.debugPair("Writing to database table", tableName)
 
@@ -598 +607 @@
       # table = stilts.tpipe(table, cmd='addcol -after TYPE TYPE_AS_INT "TYPE + 0"')
 
-      loadFITStoMYSQL (path, tableName)
+      self.scratchDb.loadFITStoMYSQL (path, tableName)
 
       self.logger.debugPair("Finished importing", tableName)
@@ -607 +616 @@
     Imports the Photcode file
     '''
-    def importPhotcodes(self, path, tableName):
+    def importPhotcodesStilts(self, path, tableName):
 
       self.logger.infoPair("Importing file", "%s (%s)" % (path, self.getFileSizeStr(self.getDiskSize(path))))