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

Timestamp:

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

Author:

eugene

Message:

enable ohana fits_to_mysql

File:

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

trunk/ippToPsps/jython/batch.py

@@ -452 +452 @@
     Accepts a regular expression filter so not all tables need to be imported
     '''
+    def importIppTables(self, columns="*", filter=""):
+        if self.useOhanaMYSQLtoFITS:
+            if not self.importIppTablesOhana():
+                self.logger.errorPair("problem running", "importIppTablesOhana")
+                return False
+        else:
+            if not self.importIppTablesStilts(columns, filter):
+                self.logger.errorPair("problem running", "importIppTablesStilts")
+                return False
+
+        return True
+
+    '''
+    Imports IPP tables from FITS file
+
+    Accepts a regular expression filter so not all tables need to be imported
+    '''
     def importIppTablesOhana(self):
         
@@ -463 +480 @@
             return False
 
-        loadFITStoMYSQL(self.fits.getPath(), "none")
+        self.scratchDb.loadFITStoMYSQL(self.fits.getPath(), "none")
 
         ## may need to do this with direct sql:
@@ -496 +513 @@
     Accepts a regular expression filter so not all tables need to be imported
     '''
-    def importIppTables(self, columns="*", filter=""):
+    def importIppTablesStilts(self, columns="*", filter=""):
         
         self.logger.infoPair("Importing tables with filter", filter)