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

Timestamp:

Aug 12, 2014, 4:10:18 PM (12 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20140717

File:

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

trunk/ippToPsps/jython/gpc1db.py

@@ -119 +119 @@
 
         try:
-            # XXX EAM : test output
-            rs = self.executeQuery(sql)
-            while (rs.next()): 
-               rows.append([rs.getInt(1), rs.getFloat(2), rs.getFloat(3)])
-            rs.close()
+            rs = self.executeQuery(sql)
+
         except:
             self.logger.exception("Can't query for ids in DVO")
             self.logger.infoPair("failed sql:", sql)
-            return rows
+            sys.exit(1)
+
+        while (rs.next()): 
+            rows.append([rs.getInt(1), rs.getFloat(2), rs.getFloat(3)])
+
+        rs.close()
 
         self.logger.debug("Found %d items in DVO database '%s' for stage='%s'" % (len(rows), dvoDb, stage))
@@ -339 +341 @@
 
 
-        # XXX EAM : test output
         self.logger.infoPair("smf files:", files)
         if len(files) < 1: return None