Changeset 38052 for branches/eam_branches/ipp-20150112/ippToPsps/jython/diffbatch.py

Timestamp:

Mar 28, 2015, 8:28:32 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150112/ippToPsps/jython/diffbatch.py (modified) (3 diffs)

branches/eam_branches/ipp-20150112/ippToPsps/jython/diffbatch.py

@@ -327 +327 @@
         self.logger.infoPair("need to cull"," nulls objid")
         results= self.scratchDb.reportAndDeleteRowsWithNULLS("DiffDetection", "diffObjID")
+        self.logger.infoPair("Adding 'row' columns to", "DiffDetection tables")
+        # diff has a primary key, so use this instead
+        self.scratchDb.addRowCountColumnNoKey("DiffDetection", "row")
         self.logger.infoPair("adding","uniquePSPSDFid")
         self.updatePspsUniqueIDs("DiffDetection")
+        self.logger.infoPair("Dropping row column from", "DiffDetection table")
+        self.scratchDb.dropColumn("DiffDetection", "row")
+ 
 
     '''
@@ -417 +423 @@
                AND b.imageID = " + str(imageID)
 
-        self.scratchDb.execute(sql)
-
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.infoPair("failed sql",sql)
+            raise
     '''
     Updates table and generates pspsuniqueids
@@ -424 +432 @@
 
     def updatePspsUniqueIDs(self,table):
-        sql = "UPDATE "+table+" join (select @r:=@r+1 rownum, diffobjID from \
-        (select @r:=0) r, "+table+" t) as foo using (diffobjID) set \
-        uniquePspsDFid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)"
+        #sql = "UPDATE "+table+" join (select @r:=@r+1 rownum, diffobjID from \
+        #(select @r:=0) r, "+table+" t) as foo using (diffobjID) set \
+        #uniquePspsDFid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)"
+        sql = "UPDATE DiffDetection set uniquePspsDFid = (("+str(self.batchID)+"*1000000000 ) + row)"
         try: self.scratchDb.execute(sql)
         except: