Changeset 39148 for trunk/ippToPsps/jython/scratchdb.py

Timestamp:

Nov 16, 2015, 3:00:27 PM (11 years ago)

Author:

eugene

Message:

recreate the dvo table templates whenever we reset the dvo tables; load photcodes and images if we are loading a new dvo

File:

• trunk/ippToPsps/jython/scratchdb.py (modified) (1 diff)

trunk/ippToPsps/jython/scratchdb.py

@@ -655 +655 @@
     def resetAllDvoTables(self):
 
-       # drop all dvo tables - NB detections have to be deleted prior to dvoDone due to foreign key constraint
-       self.logger.infoPair("Dropping table", self.dvoImagesTable)
-       self.dropTable(self.dvoImagesTable) 
-       self.logger.infoPair("Dropping table", self.dvoSkyTable)
-       self.dropTable(self.dvoSkyTable) 
-       self.logger.infoPair("Dropping table", self.dvoDoneTable)
-       self.dropTable(self.dvoDoneTable) 
-
-       # blow away existing dvoDetection table & re-crate
-       if not self.resetDvoDetectionTable():
-           self.logger.errorPair("Unable to reset scratch table", "DvoDetectionFull")
-           return False
-
-       # create dvoDone table
-       self.logger.infoPair("Creating table", self.dvoDoneTable)
-       sql = "CREATE TABLE " + self.dvoDoneTable + " (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, region VARCHAR(100), path VARCHAR(1000), modifiedDate BIGINT, size BIGINT)"
-       try: self.execute(sql)
-       except: 
-           self.logger.errorPair("Unable to create table", self.dvoDoneTable)
-           return False
-
-       self.changeEngineToInnoDB(self.dvoDoneTable)
-
-       return True
+        # re-create the definition tables
+        self.createDvoTables()
+
+        # drop all dvo tables - NB detections have to be deleted prior to dvoDone due to foreign key constraint
+        self.logger.infoPair("Dropping table", self.dvoImagesTable)
+        self.dropTable(self.dvoImagesTable) 
+        self.logger.infoPair("Dropping table", self.dvoSkyTable)
+        self.dropTable(self.dvoSkyTable) 
+        self.logger.infoPair("Dropping table", self.dvoDoneTable)
+        self.dropTable(self.dvoDoneTable) 
+
+        # blow away existing dvoDetection table & re-crate
+        if not self.resetDvoDetectionTable():
+            self.logger.errorPair("Unable to reset scratch table", "DvoDetectionFull")
+            return False
+
+        # create dvoDone table
+        self.logger.infoPair("Creating table", self.dvoDoneTable)
+        sql = "CREATE TABLE " + self.dvoDoneTable + " (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, region VARCHAR(100), path VARCHAR(1000), modifiedDate BIGINT, size BIGINT)"
+        try: 
+            self.execute(sql)
+        except: 
+            self.logger.errorPair("Unable to create table", self.dvoDoneTable)
+            return False
+
+        self.changeEngineToInnoDB(self.dvoDoneTable)
+            
+        return True
 
     '''