Changeset 23354

Timestamp:

Mar 17, 2009, 12:31:09 PM (17 years ago)

Author:

Paul Price

Message:

Allow pmFPAfileDefineFromRun to bind to a file. Added new function, pmFPAfileDefineMultipleFromRun, to define multiple files (of the same file rule name, but differing filenames) from the RUN metadata. This is intended for ppStack; might also be useful for ppMerge if we want it to support update.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfileDefine.c (modified) (3 diffs)
• pmFPAfileDefine.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -719 +719 @@
 }
 
-pmFPAfile *pmFPAfileDefineFromRun(bool *success, pmConfig *config, const char *filename)
+pmFPAfile *pmFPAfileDefineFromRun(bool *success, pmFPAfile *bind, pmConfig *config, const char *filename)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -732 +732 @@
     }
 
-    pmFPAfile *file = fpaFileDefineFromArray(config, NULL, filename, filenames); // File of interest
+    pmFPAfile *file = fpaFileDefineFromArray(config, bind, filename, filenames); // File of interest
     psFree(filenames);
 
@@ -742 +742 @@
 }
 
+psArray *pmFPAfileDefineMultipleFromRun(bool *success, psArray *bind, pmConfig *config, const char *filename)
+{
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+    PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
+
+    if (success) {
+        *success = false;
+    }
+
+    psArray *files = pmConfigRunFileGet(config, filename); // Filenames used, to return
+    if (!files || files->n == 0) {
+        if (success) {
+            *success = true;
+        }
+        return NULL;
+    }
+    if (bind && files->n != bind->n) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "Length of filenames (%ld) and bind files (%ld) does not match.",
+                files->n, bind->n);
+        psFree(files);
+        return NULL;
+    }
+
+    psArray *dummy = psArrayAlloc(1);   // Dummy array of single filename
+    for (int i = 0; i < files->n; i++) {
+        psFree(dummy->data[0]);
+        dummy->data[0] = files->data[i];
+        pmFPAfile *bindFile = bind ? bind->data[i] : NULL; // File to which to bind
+        files->data[i] = psMemIncrRefCounter(fpaFileDefineFromArray(config, bindFile, filename, dummy));
+        if (!files->data[i]) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to define file %s %d", filename, i);
+            psFree(dummy);
+            psFree(files);
+            return NULL;
+        }
+    }
+    psFree(dummy);
+
+    if (success) {
+        *success = true;
+    }
+
+    return files;
+}
 
 // define the named pmFPAfile from the camera->config

trunk/psModules/src/camera/pmFPAfileDefine.h

@@ -67 +67 @@
 pmFPAfile *pmFPAfileDefineFromRun(
     bool *found,                        ///< Found files?
+    pmFPAfile *bind,                    ///< File to which to bind, or NULL
     pmConfig *config,                   ///< Configuration
     const char *filename                ///< Name of file
     );
 
+/// Define multiple files based on the filenames in the RUN metadata in the configuration
+///
+/// An array of the files defined is returned
+psArray *pmFPAfileDefineMultipleFromRun(
+    bool *found,                        ///< Found files?
+    psArray *bind,                      ///< Files to which to bind, or NULL
+    pmConfig *config,                   ///< Configuration
+    const char *filename                ///< Name of file
+    );
 
 // look for the given argname on the argument list.  find the give filename from the file rules