Changeset 37801 for branches/eam_branches/ipp-20140904/ippToPsps/jython/loader.py

Timestamp:

Jan 11, 2015, 1:31:50 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20140904/ippToPsps/jython/loader.py (modified) (4 diffs)

branches/eam_branches/ipp-20140904/ippToPsps/jython/loader.py

@@ -24 +24 @@
 from objectbatch import ObjectBatch
 
+from diffbatch import DiffBatch 
+from diffobjectbatch import DiffObjectBatch
+
+#from forcedwarpbatch import ForcedWarpBatch 
+#from forcedobjectbatch import ForcedObjectBatch
+#
+#
 '''
 Loader class
@@ -191 +198 @@
         # loop round IDs of all items to be processed
         self.ippToPspsDb.lockBatchTable()
-        #self.logger.infoPair("heather:","lockbatchtable")
+        self.logger.infoPair("heather:","lockbatchtable")
         unattemptedCount = 0
         for id in ids:
-            #self.logger.infoPair("heather:","in ids")
+            self.logger.infoPair("heather:","in ids")
             #self.logger.infoPair("heather:id",str(id))
             batchID = self.ippToPspsDb.createNewBatch(batchType, id)
@@ -202 +209 @@
                 unattemptedCount += 1
                 continue
-            #self.logger.infoPair("heather:","passed logic")
+            self.logger.infoPair("heather:","passed logic")
 
             self.ippToPspsDb.unlockTables()
@@ -244 +251 @@
     
                 elif batchType == "DF":
+                    self.logger.infoPair("wegothere!","we are awesome")
                     batch = DiffBatch(self.logger,
                             self.config,