Changeset 36697 for trunk/ippToPsps/jython/ipptopspsdb.py

Timestamp:

Apr 25, 2014, 3:40:27 PM (12 years ago)

Author:

heather

Message:

first set of changes for new pv2 schema

File:

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

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1116 +1116 @@
         ,queue_ST \
         ,queue_OB \
+        ,queue_DF \
+        ,queue_DO \
+        ,queue_FW \
+        ,queue_FO \
         ,parallel \
         ,P2_smf_version \
@@ -1162 +1166 @@
             if rs.getInt(20) == 1: self.skychunk.batchTypes.append("ST")
             if rs.getInt(21) == 1: self.skychunk.batchTypes.append("OB")
+            if rs.getInt(22) == 1: self.skychunk.batchTypes.append("DF")
+            if rs.getInt(23) == 1: self.skychunk.batchTypes.append("DO")
+            if rs.getInt(24) == 1: self.skychunk.batchTypes.append("FW")
+            if rs.getInt(25) == 1: self.skychunk.batchTypes.append("FO")
 
             self.skychunk.force = True # TODO
             self.skychunk.parallel = False # TODO
 
-            if rs.getInt(22) == 1: self.skychunk.parallel = True
-            self.skychunk.P2_smf_version = rs.getString(23)
-            self.skychunk.ST_cmf_version = rs.getString(24)
-            self.skychunk.trange_start = rs.getString(25)
-            self.skychunk.trange_end = rs.getString(26) 
+            if rs.getInt(26) == 1: self.skychunk.parallel = True
+            self.skychunk.P2_smf_version = rs.getString(27)
+            self.skychunk.ST_cmf_version = rs.getString(28)
+            self.skychunk.trange_start = rs.getString(29)
+            self.skychunk.trange_end = rs.getString(30) 
 
             if self.skychunk.parallel: print "USING parallel"