Changeset 34649 for trunk

Timestamp:

Nov 1, 2012, 11:36:15 AM (14 years ago)

Author:

bills

Message:

dvo SecFiltFlags defines a bit that doesn't fit in smallint. We need it so move it to
bit 17

File:

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

trunk/ippToPsps/jython/objectbatch.py

@@ -116 +116 @@
             filterID = self.scratchDb.getFilterID(filter[1])
 
-            # NOTE: mask of cps.FLAGS is required to insure that it fits in Object.{grizy}Flags (which is 16 bits)
-            # DVO SecfiltFlags uses bit 24 (0x01 0000) which is out of range
+            # NOTE: Manipulation of FLAGS from cpsTable is to move ID_SECF_OBJ_EXT flag (0x01000000)
+            # from bit 24 to bit 13 so that it fits into the SMALLINT Object.Flags
 
             sql = "UPDATE Object JOIN \
@@ -133 +133 @@
                    ," + filter[1] + "20pct = MAG_20/1000 \
                    ," + filter[1] + "80pct = MAG_80/1000 \
-                   ," + filter[1] + "Flags = (0x7fff & FLAGS)  \
+                   ," + filter[1] + "Flags = (0x7fff & FLAGS) | ((FLAGS >> 11) & 0x2000) \
                    ," + filter[1] + "StackDetectID = (10 * STACK_DETECT_ID) + " + str(filterID)