Changeset 13562 for trunk/ppImage/src/ppImageDefineFile.c

Timestamp:

May 30, 2007, 3:24:59 PM (19 years ago)

Author:

eugene

Message:

fixed errors with pmImageDefineFile for DetDB queries

File:

• trunk/ppImage/src/ppImageDefineFile.c (modified) (4 diffs)

trunk/ppImage/src/ppImageDefineFile.c

@@ -5 +5 @@
 # include "ppImage.h"
 
-bool ppImageDefineFile (pmConfig *config, pmFPA *input, char *filerule, char *argname, pmFPAfileType type) {
+bool ppImageDefineFile (pmConfig *config, pmFPA *input, char *filerule, char *argname, pmFPAfileType fileType, pmDetrendType detrendType) {
 
     bool status;
@@ -17 +17 @@
     }
     if (file) {
-        if (file->type != type) {
-            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (type));
+        if (file->type != fileType) {
+            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (fileType));
             return false;
         }
@@ -31 +31 @@
     }
     if (file) {
-        if (file->type != type) {
-            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (type));
+        if (file->type != fileType) {
+            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (fileType));
             return false;
         }
@@ -39 +39 @@
 
     // look for the file to be loaded from the detrend database
-    pmFPAfileDefineFromDetDB (&status, config, filerule, input, type);
+    file = pmFPAfileDefineFromDetDB (&status, config, filerule, input, detrendType);
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "failed to load file definition");
         return false;
     }
     if (file) {
-        if (file->type != type) {
-            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (type));
+        if (file->type != fileType) {
+            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (fileType));
             return false;
         }