Changeset 33598

Timestamp:

Mar 23, 2012, 9:38:44 AM (14 years ago)

Author:

rhenders

Message:

Just removing old, redundant code

File:

• trunk/ippToPsps/jython/dvo.py (modified) (3 diffs)

trunk/ippToPsps/jython/dvo.py

@@ -51 +51 @@
         self.scratchDb.setUseFullTables(True)
 
-        self.checkDvoLocation()
-
-    '''
-    Checks whether scratch Db is using DVO Db specified in the config
-    '''
-    def checkDvoLocation(self):
-
         # decide if we are using the right DVO for this scratchDb
         self.correctDvo = self.scratchDb.isCorrectDvo(self.config.dvoLocation)
@@ -115 +108 @@
         self.logger.infoPair("DVO Images.dat file", "NOT up-to-date")
 
-        # first, delete old dvoMeta table
-        #self.logger.infoPair("Deleting from table", self.scratchDb.dvoMetaTable)
-        #sql = "DELETE FROM " + self.scratchDb.dvoMetaTable
-        #self.scratchDb.execute(sql)
-        #self.scratchDb.optimizeTable(self.scratchDb.dvoMetaTable)
-    
         self.importFits(
                 path,
@@ -127 +114 @@
         self.logger.infoPair("Adding primary key to", self.scratchDb.dvoImagesTable)
         self.scratchDb.execute("ALTER TABLE " + self.scratchDb.dvoImagesTable + " ADD PRIMARY KEY (IMAGE_ID, EXTERN_ID)")
-
-        # insert into dvoMetaFull
-        # NB what we and smf files call IMAGE_ID, DVO calls EXTERN_ID. We are sticking
-        # with the smf name
-        '''
-        self.logger.infoPair("Populating", "all image meta data")
-        sql = "INSERT INTO " + self.scratchDb.dvoMetaTable + " ( \
-               imageID, \
-               externID, \
-               flags, \
-               photcode \
-               ) SELECT \
-               IMAGE_ID, \
-               EXTERN_ID, \
-               FLAGS, \
-               PHOTCODE \
-               FROM " + self.scratchDb.dvoImagesTable
-
-        try:
-            self.scratchDb.execute(sql)
-        except:
-            self.logger.errorPair("Could not insert into", self.scratchDb.dvoMetaTable)
-            return
-        '''
 
         self.scratchDb.setImportedThisDvoTable(path)