Changeset 37917 for trunk/ippToPsps/jython/diffobjectbatch.py

Timestamp:

Feb 20, 2015, 1:19:35 PM (11 years ago)

Author:

heather

Message:

current state of ipptopsps / sas37 - ob/p2/st/df work

File:

• trunk/ippToPsps/jython/diffobjectbatch.py (modified) (4 diffs)

trunk/ippToPsps/jython/diffobjectbatch.py

@@ -177 +177 @@
             sql += ")) "
 
-            sql += "SET DiffDetObject.n" + filter[1] + " = NCODE, "
-            sql += "DiffDetObject.nDetections = DiffDetObject.nDetections + cps.NSTACK_DET"
+            sql += "SET DiffDetObject.n" + filter[1] + " = NWARP, "
+            sql += "DiffDetObject.nDetections = DiffDetObject.nDetections + cps.NWARP"
             self.logger.info(sql)
-            self.scratchDb.execute(sql)
+            try:
+                self.scratchDb.execute(sql)
+            except:
+                self.logger.errorPair("failed sql", sql)
+                return False
+
 
         # XXX this does not seem like a good thing to leave in SQL
@@ -187 +192 @@
             # now do a sum of n[filters], but do not include the ones with -999
             sql  = "UPDATE DiffDetObject "
-            sql += "SET nDetections = nDetections + n" + filter[1]
-            sql += " WHERE n" + filter[1] + " != -999"
-            self.scratchDb.execute(sql)
+            sql += "SET nDetections = nDetections + " + filter[1] +"nTotal "
+            sql += " WHERE " + filter[1] + "nTotal != -999"
+            try:
+                self.scratchDb.execute(sql)
+            except:
+                self.logger.errorPair("failed sql", sql)
+                return False
+
 
     '''
@@ -368 +378 @@
 
     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 \
-        uniquePspsDOid = ((" +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 \
+#        uniquePspsDOid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)"
+        sql = "UPDATE DiffDetObject set uniquePspsDOid = (("+str(self.batchID)+"*1000000000 ) + row)"
         try: self.scratchDb.execute(sql)
         except:
@@ -407 +418 @@
         self.scratchDb.execute("ALTER TABLE DiffDetObject CHANGE dec_ `dec` double")
 
+        self.logger.infoPair("Adding 'row' columns to", "Diff Det Object")
+        self.scratchDb.addRowCountColumn("DiffDetObject", "row")
+        self.logger.infoPair("Adding unique", "Diff Det Object ")
         self.updatePspsUniqueIDs("DiffDetObject")
+        self.logger.infoPair("Dropping row column from", "DiffDetObject table")
+        self.scratchDb.dropColumn("DiffDetObject", "row")
 
         self.dvoObjects.purgeRegion(self.region)