Changeset 23268 for trunk/psModules/src/config

Timestamp:

Mar 11, 2009, 10:54:22 AM (17 years ago)

Author:

Paul Price

Message:

Adding functionality of reading input files from the configuration dump. This is principally used for ensuring we apply the same detrend images with ppImage that we used originally. Applying this framework to ppImage. Will soon apply to other products. Reworked the pmFPAfileDefineFrom* functions to use common code; I think it still works.

Location:

trunk/psModules/src/config

Files:

• pmConfigRun.c (modified) (1 diff)
• pmConfigRun.h (modified) (1 diff)

trunk/psModules/src/config/pmConfigRun.c

@@ -71 +71 @@
 }
 
+psArray *pmConfigRunFileGet(pmConfig *config, const char *name)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+
+    psMetadata *run = configRun(config);// RUN information
+    psAssert(run, "Require run-time information");
+    psMetadata *files = configElement(run, "FILES", "Filerules used during execution");
+    psAssert(files, "Require list of files");
+
+    psList *list = psListAlloc(NULL);   // List of file names
+
+    psString regex = NULL;              // Regular expression for iteration
+    psStringAppend(&regex, "^%s$", name);
+    psMetadataIterator *iter = psMetadataIteratorAlloc(files, PS_LIST_HEAD, regex);
+    psFree(regex);
+    psMetadataItem *item;               // Item from iteration
+    while ((item = psMetadataGetAndIncrement(iter))) {
+        psAssert(item->type == PS_DATA_STRING, "We only put STRING types here.");
+        psListAdd(list, PS_LIST_TAIL, item->data.str);
+    }
+    psFree(iter);
+
+    if (psListLength(list) == 0) {
+        // Didn't find anything
+        psFree(list);
+        return NULL;
+    }
+
+    psArray *array = psListToArray(list); // Array of file names, to return
+    psFree(list);
+
+    return array;
+}
+
 
 bool pmConfigRunCommand(pmConfig *config, int argc, char **argv)

trunk/psModules/src/config/pmConfigRun.h

@@ -10 +10 @@
     pmConfig *config,                   ///< Configuration
     const pmFPAfile *file               ///< File to add
+    );
+
+/// Retrieve file names for a symbolic file from the run-time information
+psArray *pmConfigRunFileGet(
+    pmConfig *config,                   ///< Configuration
+    const char *name                    ///< Name of symbolic file (pmFPAfile)
     );