Changeset 39224 for branches/eam_branches/ipp-20151113/ippToPsps/jython/loader.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/loader.py (modified) (1 diff)

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/loader.py

@@ -172 +172 @@
                     if (batchType == "P2" or batchType == "ST" or batchType =="DF" or batchType == "FW"):
                         if self.config.resetDvo or not self.ippToPspsDb.isBoxIngested(boxId, self.scratchDb.dbHost):
-                            if not self.dvo.nativeIngestDetections(boxId, boxDim):
+                            if not self.dvo.nativeIngestDetections(boxId, boxDim, batchType):
                                 self.logger.error("Unable to ingest detections with nativeIngest")
                                 return False

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