Changeset 35183 for trunk/ippToPsps/jython/dvo.py

Timestamp:

Feb 20, 2013, 9:49:30 AM (13 years ago)

Author:

eugene

Message:

box.ingested value is now the hostname

File:

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

trunk/ippToPsps/jython/dvo.py

@@ -587 +587 @@
         # blow away existing dvoDetection table
 
-        # clear the 'ingested' field for all boxes
-        # XXX oops: this causes problems for multiple loaders...
-        # set/clear should be using the HOST id as the value in the table.
-        # self.ippToPspsDb.clearIngestedBoxes()
+        # clear the 'ingested' field for all boxes owned by this host
+        self.ippToPspsDb.clearIngestedBoxes(self.scratchDb.dbHost)
         
+        print "*******************************************************************************"
+        self.logger.warning("about to delete detection table and re-ingest; is this correct?")
+        response = raw_input("(y/n) ")
+        if response != "y":
+            raise
+        self.logger.warning("Are you ABSOLUTELY sure you want to do this?")
+        response = raw_input("(y/n) ")
+        if response != "y":
+            raise
+
         # drop detections table
         self.logger.infoPair("Dropping table", self.scratchDb.dvoDetectionTable)
@@ -644 +652 @@
         ## dvopsps can take a very long time. try 2 or 3 times to re-establish communication with the db before proceeding?
 
-        self.ippToPspsDb.setIngestedBox(boxId)
+        self.ippToPspsDb.setIngestedBox(boxId, self.scratchDb.dbHost)
 
         # add fileID column