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

Timestamp:

Jan 25, 2012, 5:10:25 PM (15 years ago)

Author:

rhenders

Message:

now storing size and modified date of each file ingested from DVO

File:

• trunk/ippToPsps/jython/scratchdb.py (modified) (4 diffs)

trunk/ippToPsps/jython/scratchdb.py

@@ -26 +26 @@
             self.dvoDetectionTable = "dvoDetectionFull"
             self.dvoDoneTable = "dvoDone"
-            self.dvoSkyTable = "SkyTable_fits"
+            self.dvoSkyTable = "dvoSkyTable"
+            self.dvoImageTable = "dvoImages"
         else:
             self.dvoMetaTable = "dvoMeta"
@@ -183 +184 @@
 
     '''
+    Have we already imported this DVO table?
+    '''
+    def alreadyImportedThisDvoTable(self, path):
+
+        fileStat = os.stat(path)
+
+        sql = "SELECT COUNT(*) FROM " + self.dvoDoneTable + " WHERE path = '" + path + "' AND modifiedDate = " + str(fileStat.st_mtime) 
+
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            if rs.getInt(1) > 0:
+                self.logger.errorPair("Already imported up-to-date version of",  path)
+                return True
+            else:
+                return False
+        except:
+            self.logger.exception("Unable to check whether this DVO table has been imported")
+
+
+    '''
     Updates dvoDone table with this DVO table
     '''
-    def setImportedThisDvoTable(self, name):
-
-        sql = "INSERT INTO dvoDone (name) VALUES ('" + name + "')"
+    def setImportedThisDvoTable(self, path):
+
+        fileStat = os.stat(path)
+
+        # first delete any old version we have ingested
+        sql = "DELETE FROM " + self.dvoDoneTable + " WHERE path = '" + path + "'"
+        self.execute(sql)
+
+        # now insert new version with up-to-date size and date
+        sql = "INSERT INTO " + self.dvoDoneTable + " (path, modifiedDate, size) VALUES ('" + path + "', " + str(str(fileStat.st_mtime)) + ", " + str(str(fileStat.st_size)) + ")"
         self.execute(sql)
         
@@ -210 +239 @@
 
         return True
-
-    '''
-    Have we already imported this DVO table?
-    '''
-    def alreadyImportedThisDvoTable(self, name):
-
-        sql = "SELECT COUNT(*) FROM dvoDone WHERE name = '" + name + "'"
-
-        try:
-            rs = self.executeQuery(sql)
-            rs.first()
-            if rs.getInt(1) > 0:
-                self.logger.errorPair("Already imported DVO tables for",  name)
-                return True
-            else:
-                return False
-        except:
-            self.logger.exception("Unable to check whether this DVO table has been imported")
 
 
@@ -298 +309 @@
 
        self.logger.infoPair("Creating table", self.dvoDoneTable )
-       sql = "CREATE TABLE " + self.dvoDoneTable + " (name VARCHAR(100))"
+       sql = "CREATE TABLE " + self.dvoDoneTable + " (path VARCHAR(1000), modifiedDate BIGINT, size BIGINT)"
        try: self.execute(sql)
        except: self.logger.errorPair("Unable to create table", self.dvoDoneTable)