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

Timestamp:

Oct 29, 2015, 10:50:19 AM (11 years ago)

Author:

eugene

Message:

generate the table_index columns; update diff and forcedwarp to use fits_to_mysql

File:

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

trunk/ippToPsps/jython/batch.py

@@ -466 +466 @@
     '''
     Imports IPP tables from FITS file
-
-    Accepts a regular expression filter so not all tables need to be imported
     '''
     def importIppTablesOhana(self):
@@ -473 +471 @@
         self.logger.infoPair("Importing IPP tables", "using fits_to_mysql")
 
+        count = 0
+        self.tablesLoaded = []
+
+        fileName = self.fits.getPath()
+
+        # this option is equivalent to the stilts "addcol table_index $0" call
+        fitsOptions  = " -sequence-column table_index"
+        fitsOptions += " -sequence-column-start 1"
+
+        ## *** actually write the FITS data to mysql
+        self.scratchDb.loadFITStoMYSQL(fileName, fitsOptions)
+
         ## use stilts to get a list of the tables from the header
         try:
-            tables = stilts.treads(self.fits.getPath())
+            tables = stilts.treads(fileName)
         except:
-            self.logger.errorPair("STILTS could not import from", self.fits.getPath())
-            return False
-
-        self.scratchDb.loadFITStoMYSQL(self.fits.getPath())
-
-        ## may need to do this with direct sql:
-        # table = stilts.tpipe(table, cmd='addcol table_index $0')
-
-        self.tablesLoaded = []
-
-        count = 0
+            self.logger.errorPair("STILTS could not import from", fileName)
+            return False
+
         for table in tables:
-
             # example of listing all columns in a table:
             ## print "-----table: " + table.name