Changeset 38891 for trunk/ippToPsps/jython/gpc1db.py

Timestamp:

Oct 20, 2015, 2:17:07 PM (11 years ago)

Author:

eugene

Message:

forced warp files end in .cmf

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (4 diffs)

trunk/ippToPsps/jython/gpc1db.py

@@ -285 +285 @@
               AND stage_id = " + str(stageID)
 
-        try:
-            rs = self.executeQuery(sql)
-        except:
-            self.logger.exception("Can't query for addIDs using :" + sql )
+        rs = self.executeQuery(sql)
 
         addIDs = []
@@ -306 +303 @@
     def getListOfDiffSkyFileIdsForDiffBatch(self, dvoDb, stageID):
 
-        self.logger.debug("Querying GPC1 for add IDs for ff_id: " + str(stageID))
+        self.logger.debug("Querying GPC1 for add IDs for diff_id: " + str(stageID))
         stage = "diff"
         sql = "SELECT diff_skyfile_id \
@@ -490 +487 @@
               join fullForceResult using (ff_id, warp_id) \
               where add_id = %d" % forcedWarpID
+
         try:
             rs = self.executeQuery(sql)
@@ -506 +504 @@
         files = []
         if pathBase.startswith("neb"):
-        
             f=os.popen("neb-ls -p " + pathBase + ".cmf")
             for i in f.readlines():
-        
                 files.append(i.rstrip())
-        
+
+        else:
+            files = glob.glob(pathBase + ".cmf")
+
         
         if len(files) < 1: return None