Changeset 35184

Timestamp:

Feb 20, 2013, 2:42:35 PM (13 years ago)

Author:

eugene

Message:

use scratchdb hostname to indicate ingested state (and by whom)

Location:

trunk/ippToPsps/jython

Files:

• ipptopspsdb.py (modified) (2 diffs)
• loader.py (modified) (1 diff)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1079 +1079 @@
     Inserts new box into box table. If it already exisits, it returns existing box id 
     '''
-    def isBoxIngested(self, id):
+    def isBoxIngested(self, id, host):
 
         # set the field 'ingested' to 1 for this box
@@ -1088 +1088 @@
                 print "no matching boxes for ", str(id)
                 raise
-            status = rs.getInt(1)
-        except:
-            print "failed to set box ", str(id), "as ingested"
+            value = rs.getString(1)
+        except:
+            print "failed to find box for ", str(id)
             raise
 
-        return status
+        if value == host:
+            return 1
+
+        if value == "none":
+            return 0
+
+        print "box ingested host ", value, " does not match db host ", host
+        raise
+
     '''
     Inserts new box into box table. If it already exisits, it returns existing box id 

trunk/ippToPsps/jython/loader.py

@@ -195 +195 @@
                             # need to work out a good boundary / region strategy in coordination with 
                             # impact of mysql insertion
-                            if not self.ippToPspsDb.isBoxIngested(boxId):
+                            if not self.ippToPspsDb.isBoxIngested(boxId, self.scratchDb.dbHost):
                                 self.dvoDetections.nativeIngestDetections(boxId, boxDim['RA'], boxDim['DEC'], boxSize)