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

Timestamp:

Oct 22, 2015, 6:50:53 AM (11 years ago)

Author:

eugene

Message:

forcedwarp cannot get filter from header, has to get it from db; use a dictionary to return key/value pairs

File:

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

trunk/ippToPsps/jython/gpc1db.py

@@ -388 +388 @@
         self.logger.debug("Querying GPC1 for forced warp meta data")
 
-        meta = []
+        meta = {}
 
         sql = "SELECT \
                exp_id, \
                exp_time, \
+               filter,
                fullForceResult.software_ver, \
                skycell_id, \
@@ -415 +416 @@
 
         try:
-            meta.append(rs.getString(1))
-            meta.append(rs.getString(2))
-            meta.append(rs.getString(3))
-            meta.append(rs.getString(4))
-            meta.append(rs.getString(5))
-
-        except:
-            self.logger.errorPair("getForcedWarpStageMeta()", "empty meta data")
+            meta['exp_id']       = rs.getString(1)
+            meta['exp_time']     = rs.getString(2)
+            meta['filter']       = rs.getString(3)
+            meta['software_ver'] = rs.getString(4)
+            meta['skycell_id']   = rs.getString(5)
+            meta['tess_id']      = rs.getString(6)
+        except:
+            self.logger.errorPair("getForcedWarpStageMeta()", "missing metadata entry")
 
         return meta
-
-
 
     '''