Changeset 39038 for trunk

Timestamp:

Nov 3, 2015, 10:42:21 PM (11 years ago)

Author:

eugene

Message:

tighted code and raise a valid error if we fail to find the file or filename

File:

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

trunk/ippToPsps/jython/gpc1db.py

@@ -535 +535 @@
                AND stage = 'diff'"
 
-        try:
-            rs = self.executeQuery(sql)
-            rs.first()
-        except:
-            self.logger.infoPair("failed sql", sql)
-            self.logger.errorPair("can't query for diff cmf", "dfif_skyfile_id = %d" %diff_skyfile_id)
+        rs = self.executeQuery(sql)
+
+        if not rs.first():
+            self.logger.errorPair("missing cmf entry diff_skyfile_id:", str(diff_skyfile_id))
+            # self.logger.errorPair("no diff cmfs found for diff_skyfile_id = %d" %diff_skyfile_id)
             return None
-        print "query worked"
-        try: 
-            pathBase = rs.getString(1)
-        except:    
-            self.logger.errorPair("no diff cmfs found for diff_skyfile_id = %d" %diff_skyfile_id)
-            return None
-        print pathBase
+
+        pathBase = rs.getString(1)
+
         files = []
         if pathBase.startswith("neb"):
-            print "open"
+            self.logger.debugPair("searching for nebulous files", pathBase)
             f=os.popen("neb-ls -p " + pathBase + ".cmf")
             for i in f.readlines():
-                print "i",i
+                self.logger.debugPair("real file", i.rstrip())
                 files.append(i.rstrip())
-                print "append"
-# No clue what this is here for, but it breaks things.                
-#        print i
         else:
             files = glob.glob(pathBase + ".cmf")
 
-        if len(files) < 1: return None
+        if len(files) < 1: 
+            self.logger.errorPair ("no cmf file found matching pathBase", pathBase + ".cmf")
+            return None
+
         fits = Fits(self.logger, self.config, files[0])
         return fits