Changeset 39224 for branches/eam_branches/ipp-20151113/ippToPsps/jython/scratchdb.py

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/jython/scratchdb.py (modified) (2 diffs)

branches/eam_branches/ipp-20151113/ippToPsps

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

branches/eam_branches/ipp-20151113/ippToPsps/jython/scratchdb.py

@@ -406 +406 @@
 
         return size
+
+    '''
+    Returns a row count for this table
+    '''
+    def getMaxIPP_IDET(self, table):
+
+        sql = "SELECT MAX(IPP_IDET) FROM " + table
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.exception("Could not count rows for table: '" + table + "'")
+            return 0
+
+        return rs.getInt(1)
 
     '''
@@ -655 +669 @@
     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
 
     '''

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile