Changeset 37133 for branches/eam_branches/ipp-20140717/ippToPsps/jython/scratchdb.py

Timestamp:

Jul 29, 2014, 9:52:00 AM (12 years ago)

Author:

eugene

Message:

scatter some debugging prints around; replace safeDictionaryAccess (terrible name) with getKeyValue; fix use of strings vs sql words in insert queries; fix detections for new schema; remove use of old dvograbber-based code; clean some avoidable errors

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/scratchdb.py (modified) (3 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/scratchdb.py

@@ -229 +229 @@
     def alreadyImportedThisDvoTable(self, path):
 
-        print "***** alreadyImportedThisDvoTable *****"
-        print "path: " + path
-
         fileStat = os.stat(path)
-        print "path: " + path
 
         sql = "SELECT COUNT(*) FROM " + self.dvoDoneTable + " WHERE path = '" + path + "' AND modifiedDate = " + str(fileStat.st_mtime) 
-        print "sql: " + sql
-
-        try:
-            rs = self.executeQuery(sql)
-            print "ran sql: " + sql
+
+        try:
+            rs = self.executeQuery(sql)
             rs.first()
             if rs.getInt(1) > 0:
-                print "***** DID import previously *****"
                 self.logger.debugPair("Already imported up-to-date version of",  path)
                 return True
             else:
-                print "***** did NOT import previously *****"
+                self.logger.infoPair("Did NOT already import from",  path)
                 return False
         except:
             print "***** exception in alreadyImportedThisDvoTable *****"
             self.logger.exception("Unable to check whether this DVO table has been imported")
-
-        print "***** done with alreadyImportedThisDvoTable *****"
-
 
     '''
@@ -342 +332 @@
             rs.close()
             if not haveDone:
-                print "dvoDone not yet build"
+                self.logger.info("dvoDone not yet built")
                 return False
-        except:
-            print "failed to run query: " + sql
+
+        except Exception, e:
+            print str(e)
+            self.logger.errorPair("problem examining table", sql)
+            sys.exit(1)
 
         sql = "SELECT path FROM " + self.dvoDoneTable + " WHERE path LIKE '%SkyTable.fits'"
-        try:
-            rs = self.executeQuery(sql)  
-            rs.first()
-
+        try: rs = self.executeQuery(sql)  
+        except Exception, e:
+            print str(e)
+            self.logger.errorPair("problem querying for dvo path", path)
+            sys.exit(1)
+
+        if not rs.next():
+            self.logger.info("dvoDone exists, but is empty")
+            return False
+
+        try:
             head,tail = os.path.split(rs.getString(1))
 
@@ -358 +358 @@
                 return True
             else: 
-                self.logger.errorPair("DVO does not match. We have", head)
+                self.logger.infoPair("DVO does not match. We have", head)
                 return False
 
         except Exception, e:
             print str(e)
-            self.logger.errorPair("No DVO files ingested for this path", path)
-            return False
+            self.logger.errorPair("problem searching for DVO at", path)
+            sys.exit(1)
 
     '''