Changeset 33760 for trunk

Timestamp:

Apr 11, 2012, 11:56:08 AM (14 years ago)

Author:

rhenders

Message:

new code to populate ObjectCalColor, but commented outfor now; fix for issue of STILTS renaming dec to dec_ (as it is a MySQL reserved word). forcing back to dec again so as not to breal PSPS load

File:

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

trunk/ippToPsps/jython/objectbatch.py

@@ -78 +78 @@
     def alterPspsTables(self):
 
+        # index objID column
         self.scratchDb.makeColumnUnique("Object", "objID")
 
+        # dec is reserved in MySQL, so STILTS replaces if with dec_, which PSPS doesn't like. so, force it back again
+        self.scratchDb.execute("ALTER TABLE Object CHANGE dec_ `dec` double")
+
         return True
 
@@ -97 +101 @@
 
         # list of all filters we are interested in
-        allFilters = ['g', 'r', 'i', 'z', 'y']
+        allFilters = ['g', 'r', 'i', 'z', 'y', ]
         
         # this loop looks into the DVO Photcodes tables and gets the 'CODE' for each the filters above that are listed
@@ -148 +152 @@
             self.logger.errorPair("Couldn't calculate colors", sql)
 
-
-    '''
-    Does the processing, i.e. pulling stuff from IPP tables into PSPS tables
-    '''
-    def populatePspsTables(self):
+    '''
+    Populates the Object table
+    '''
+    def populateObjectTable(self):
 
         cptTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cpt")
         cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps")
 
-        self.logger.infoPair("Inserting objects from", "cpt")
+        self.logger.infoPair("Populating", "ObjectCalColor")
+        self.logger.infoPair("Inserting objects from", "cpt file")
         sql = "INSERT IGNORE INTO Object (\
                objID \
@@ -164 +168 @@
                ,surveyID \
                ,ra \
-               ,dec_ \
+               ,`dec` \
                ,raErr \
                ,decErr \
                ,nDetections \
+               ,dataRelease \
                ) \
                SELECT \
@@ -179 +184 @@
                ,DEC_ERR \
                ,NMEASURE \
+               , " + str(self.config.dataRelease) + "\
                FROM " + cptTableName
 
@@ -185 +191 @@
         except:
             self.logger.errorPair("Couldn't populate Object table", sql)
+            return False
+
 
         # add row count columns so we can perform joins to get colors
@@ -206 +214 @@
         return True
 
+    '''
+    Populates the ObjectCalColor table
+    '''
+    def populateObjectCalColorTable(self):
+
+        self.logger.infoPair("Populating", "ObjectCalColor")
+
+        sql = "INSERT INTO ObjectCalColor ( \
+               objID \
+               ,ippObjID \
+               ,dataRelease \
+               ) \
+               SELECT \
+               objID \
+               ,ippObjID \
+               ,dataRelease \
+               FROM Object"
+        try:
+            self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair("Couldn't populate ObjectCalColor table", sql)
+            return False
+
+        return True
+
+    '''
+    Does the processing, i.e. pulling stuff from IPP tables into PSPS tables
+    '''
+    def populatePspsTables(self):
+
+        if not self.populateObjectTable(): return False
+        #if not self.populateObjectCalColorTable(): return False
+
+        return True
+