Changeset 37801 for branches/eam_branches/ipp-20140904/ippToPsps/jython/objectbatch.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/objectbatch.py (modified) (6 diffs)

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

@@ -87 +87 @@
         return True
 
+    '''
+    Updates table and generates pspsuniqueids
+    '''
+    
+    def updatePspsUniqueIDs(self):
+        sql = "UPDATE ObjectThin join (select @r:=@r+1 rownum, objID from \
+        (select @r:=0) r, ObjectThin t) as foo using (objID) set \
+        uniquePspsOBid = ((" +str(self.batchID) +"*1000000000 ) + rownum)";
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair('failed sql',sql)
+            raise
+        
+
+    
     '''
     Applies indexes to the IPP tables
@@ -336 +351 @@
         sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
         sqlLine.group("surveyID",        "'" + str(self.surveyID) + "'")
-        sqlLine.group("randomID",        "FLOOR(RAND()*9223372036854775807)") # XXX where does this number come from??
+        sqlLine.group("randomID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)") # XXX where does this number come from??
         sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
         sqlLine.group("dvoRegionID",     "CAT_ID") 
@@ -410 +425 @@
  
         sql = "DELETE FROM ObjectThin where \
-              ObjectThin.decMean > " + str(decMax) + " or \
-              ObjectThin.decMean < " + str(decMin) + " or \
-              ObjectThin.raMean > " + str(raMax) + " or \
-              ObjectThin.raMean < " + str(raMin) 
+              ObjectThin.decMean > (" + str(decMax) + " + .0033) or \
+              ObjectThin.decMean < (" + str(decMin) + " - .0033) or \
+              ObjectThin.raMean > (" + str(raMax) + " + .0033) or \
+              ObjectThin.raMean < (" + str(raMin) + " - .0033)" 
         self.logger.infoPair("Deleting", str(nToDelete) + " objects outside of ra/dec range")
 
@@ -429 +444 @@
         ##self.dvoObjects.purgeRegion(self.region)
 
+        self.updatePspsUniqueIDs()
+        
         self.setMinMaxObjID(["ObjectThin"])
 
@@ -439 +456 @@
         cptTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cpt")
         cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps")
-        self.logger.infoPair("Populating MeanObject from ", "ObjectThin")
-
-        sql = "INSERT INTO MeanObject ( objID ) SELECT objID FROM ObjectThin"
+        self.logger.infoPair("Populating MeanObject.objid and uniquePspsOBid from ", "ObjectThin")
+
+        sql = "INSERT INTO MeanObject ( objID, uniquePspsOBid ) SELECT objID, uniquePspsOBid FROM ObjectThin"
         try:
             self.scratchDb.execute(sql)
@@ -450 +467 @@
         self.logger.infoPair("Adding 'row' columns to", "MeanObject table")
         self.scratchDb.addRowCountColumn("MeanObject", "row")
- 
+
+
+
+        
 
         ##self.scratchDb.addRowCountColumn(cpsTableName, "row")