Changeset 29198

Timestamp:

Sep 22, 2010, 2:01:36 PM (16 years ago)

Author:

rhenders

Message:

Moved input-file check to more general place

Location:

trunk/ippToPsps/src

Files:

• ippToPsps.c (modified) (1 diff)
• ippToPspsBatchDetection.c (modified) (1 diff)

trunk/ippToPsps/src/ippToPsps.c

@@ -210 +210 @@
 // Runs the requested process
 static int ippToPsps_run(IppToPsps *this) {
+
+    // any files?
+    if (this->batchType == BATCH_DETECTION ||
+            this->batchType == BATCH_STACK ||
+            this->batchType == BATCH_DIFFERENCE ) {
+    
+        if (this->numOfInputFiles < 1) this->exitCode = PS_EXIT_DATA_ERROR;
+        psError(PS_ERR_UNKNOWN, false, "No input files for this batch");
+
+    }
 
     if(this->exitCode == PS_EXIT_SUCCESS) {

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -34 +34 @@
   */
 int ippToPsps_batchDetection(IppToPsps *this) {
-
-    if (this->numOfInputFiles < 1) return PS_EXIT_DATA_ERROR;
 
     int status = 0;