Changeset 35748 for branches/eam_branches/ipp-20130509/ippToPsps/jython/dvo.py

Timestamp:

Jul 3, 2013, 1:44:20 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ippToPsps

Files:

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

branches/eam_branches/ipp-20130509/ippToPsps/jython/dvo.py

@@ -65 +65 @@
         if not self.correctDvo:
             print "*******************************************************************************"
-            self.logger.warning("Wrong or no DVO in use. Do you want to reset and use '" + self.skychunk.dvoLocation + "'?")
-            response = raw_input("(y/n) ")
-            if response == "y":
-                self.logger.warning("Are you ABSOLUTELY sure you want to do this?")
-                response = raw_input("(y/n) ")
-                if response == "y":
-                    self.resetAllTables()
-
+            self.logger.warning("switching to a new dvo: " + self.skychunk.dvoLocation)
+            # response = raw_input("(y/n) ")
+            # if response == "y":
+            #     self.logger.warning("Are you ABSOLUTELY sure you want to do this?")
+            #     response = raw_input("(y/n) ")
+            #     if response == "y":
+            self.resetAllTables()
 
     '''
@@ -597 +596 @@
         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
+        if True:
+            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
 
         # blow away existing dvoDetection table & re-crate