Changeset 37586 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Nov 12, 2014, 12:05:37 PM (12 years ago)

Author:

heather

Message:

small schema tweaks, as well as we now populate stackDetectRowID in
stackObjectThin / stackObjectAttributes tables

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (5 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -293 +293 @@
         self.generateRandomIDs()
 
+        self.generateStackDetectRowIDs()
+
         # add indexes StackObjectThin
         self.scratchDb.createIndex("StackObjectThin", "objID")
@@ -382 +384 @@
         self.logger.infoPair("Procesing table", tablename)
         self.insertDvoIDs(tablename, "StackObjectThin")
-
+        
         # if we are going to add a key, do it here so it is useful
         self.scratchDb.createIndex(tablename, "objID") 
@@ -949 +951 @@
 
 
+    def generateStackDetectRowIDs(self):
+        sql = "UPDATE StackObjectThin join (select @r:=@r+1 rownum, objID from \
+        (select @r:=0) r, StackObjectThin t) as foo using (objID) set \
+        stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum)";
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair('failed sql',sql)
+            return
+        
+
     '''
     select objID (psps object ID) from dvo restricted to this set of imageIDs. also insert
@@ -1008 +1020 @@
             if (i < len(self.filters) - 1):
                 fields += ", "
-        
+
+        if (table == "StackObjectAttributes"):
+            fields += "stackDetectRowID, "
         sql  = "INSERT INTO " + table + " (" + fields + ") "
         sql += "SELECT " + fields + " FROM " + mainTable
@@ -1016 +1030 @@
             self.logger.errorPair('failed sql',sql)
             return
-    
+
+
+        
     '''
     Does the processing, i.e. pulling stuff from IPP tables into PSPS tables