Changeset 34807 for trunk

Timestamp:

Dec 13, 2012, 2:55:36 PM (14 years ago)

Author:

bills

Message:

changes used for SAS 11

File:

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

trunk/ippToPsps/jython/objectbatch.py

@@ -134 +134 @@
                    ," + filter[1] + "80pct = MAG_80/1000 \
                    ," + filter[1] + "Flags = (0x7fff & FLAGS) | ((FLAGS >> 11) & 0x2000) \
-                   ," + filter[1] + "StackDetectID = STACK_DETECT_ID"
+                   ," + filter[1] + "StackDetectID = (10 * STACK_DETECT_ID) + " + str(filterID)
 
             #self.logger.info(sql)
@@ -236 +236 @@
                ,ippObjID \
                ,objInfoFlag \
-               ,varFlag \
+               ,qualityFlag \
                ,surveyID \
                ,ra \
@@ -246 +246 @@
                ,sgSep \
                ,dataRelease \
+               ,Random \
                ) \
                SELECT \
@@ -251 +252 @@
                ,CAT_ID*1000000000 + OBJ_ID \
                ,FLAGS \
-               ,0 \
+               ,FLAGS >> 24 & 0xFF \
                ," + str(self.surveyID) + " \
                ,RA \
@@ -261 +262 @@
                ,STARGAL_SEP \
                , " + str(self.config.dataRelease) + "\
+               , RAND() \
                FROM " + cptTableName