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

Timestamp:

Oct 10, 2015, 12:56:31 PM (11 years ago)

Author:

eugene

Message:

track the loaded tables so we can cleanly skip missing tables

File:

• trunk/ippToPsps/jython/batch.py (modified) (1 diff)

trunk/ippToPsps/jython/batch.py

@@ -443 +443 @@
     def importIppTables(self, columns="*", filter=""):
 
-      self.logger.infoPair("Importing tables with filter", filter)
-
-      # print "trying to read ", self.fits.getPath()
-
-      try:
-          tables = stilts.treads(self.fits.getPath())
-      except:
-          self.logger.errorPair("STILTS could not import from", self.fits.getPath())
-          return False
-
-      count = 0
-      for table in tables:
-
-          # print "import smf table ", table
-          match = re.match(filter, table.name)
-          if not match: continue
-          self.logger.debugPair("Reading IPP table", table.name)
-          table = stilts.tpipe(table, cmd='addcol table_index $0')
-
-          table = stilts.tpipe(table, cmd='explodeall')
-
-          # print "read smf table ", table
-          self.logger.infoPair("read smf table", table)
-
-          # drop any previous tables before import
-          self.scratchDb.dropTable(table.name)
-
-          # IPP FITS files are littered with infinities, so remove these
-          self.logger.debug("Removing Infinity values from all columns")
-          table = stilts.tpipe(table, cmd='keepcols "' + columns + '"')
-          table = stilts.tpipe(table, cmd='replaceval -Infinity null *')
-          table = stilts.tpipe(table, cmd='replaceval Infinity null *')
-          # print "cleaned up values ", table
-
-          try:
-              table.write(self.scratchDb.url + '#' + table.name)
-              # XXX this one is not needed
-              # self.scratchDb.killLastConnectionID()
-              count = count + 1
-          except:
-              self.logger.exception("Problem writing table '" + table.name + "' to the database")
+        self.logger.infoPair("Importing tables with filter", filter)
+
+        # print "trying to read ", self.fits.getPath()
+
+        try:
+            tables = stilts.treads(self.fits.getPath())
+        except:
+            self.logger.errorPair("STILTS could not import from", self.fits.getPath())
+            return False
+
+        self.tablesLoaded = []
+
+        count = 0
+        for table in tables:
+
+            # print "import smf table ", table
+            match = re.match(filter, table.name)
+            if not match: continue
+            self.logger.debugPair("Reading IPP table", table.name)
+            table = stilts.tpipe(table, cmd='addcol table_index $0')
+
+            table = stilts.tpipe(table, cmd='explodeall')
+
+            # print "read smf table ", table
+            self.logger.infoPair("read smf table", table)
+
+            # drop any previous tables before import
+            self.scratchDb.dropTable(table.name)
+
+            # IPP FITS files are littered with infinities, so remove these
+            self.logger.debug("Removing Infinity values from all columns")
+            table = stilts.tpipe(table, cmd='keepcols "' + columns + '"')
+            table = stilts.tpipe(table, cmd='replaceval -Infinity null *')
+            table = stilts.tpipe(table, cmd='replaceval Infinity null *')
+            # print "cleaned up values ", table
+
+            try:
+                table.write(self.scratchDb.url + '#' + table.name)
+                # XXX this one is not needed
+                # self.scratchDb.killLastConnectionID()
+                count = count + 1
+            except:
+                self.logger.exception("Problem writing table '" + table.name + "' to the database")
+
+            self.tablesLoaded.append(table.name)
 
       self.logger.infoPair("Done. Imported", "%d tables" % count)