Changeset 38987 for trunk

Timestamp:

Oct 27, 2015, 5:12:29 PM (11 years ago)

Author:

watersc1

Message:

Fix my typo of = instead of == in queue.py. Change count++ to count += 1 in batch.py because I guess python doesn't do ++? Comment out my change of queue_FG in ipptopspsdb.py because it breaks something when I attempt to run the test suite.

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (1 diff)
• ipptopspsdb.py (modified) (2 diffs)
• queue.py (modified) (1 diff)

trunk/ippToPsps/jython/batch.py

@@ -484 +484 @@
 
             self.tablesLoaded.append(table.name)
-            count ++
+            count += 1
 
         self.logger.infoPair("Done. Imported", "%d tables" % count)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1104 +1104 @@
         ,queue_FW \
         ,queue_FO \
-        ,queue_FG \
         ,parallel \
         ,P2_smf_version \
@@ -1112 +1111 @@
         FROM skychunk \
         WHERE name = '" + self.skychunk.name + "'"
-
+#        ,queue_FG \
         self.skychunk.batchTypes = []
 

trunk/ippToPsps/jython/queue.py

@@ -73 +73 @@
 
                 # for object-like batches, info comes from dvo
-                if (batchType == "OB" or batchType =="DO" or batchType =="FO" or batchType = "FG"):
+                if (batchType == "OB" or batchType =="DO" or batchType =="FO" or batchType == "FG"):
                     self.dvoObjects.setSkyArea(
                             self.skychunk.minRa,