Changeset 18939 for trunk/psModules/src/config/pmConfigDump.c

Timestamp:

Aug 5, 2008, 5:40:45 PM (18 years ago)

Author:

Paul Price

Message:

Don't get rid of derivative cameras when culling in preparation for dump.

File:

• trunk/psModules/src/config/pmConfigDump.c (modified) (4 diffs)

trunk/psModules/src/config/pmConfigDump.c

@@ -13 +13 @@
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
+#include "pmConfigCamera.h"
 
 #include "pmConfigDump.h"
@@ -18 +19 @@
 // Cull entries in the metadata, ignoring the ones listed.
 static bool configCull(psMetadata *md,  // Configuration metadata from which to cull
-                       const char *list // List of items NOT to cull
+                       const psArray *list // List of items NOT to cull
     )
 {
     PS_ASSERT_METADATA_NON_NULL(md, false);
+    PS_ASSERT_ARRAY_NON_NULL(list, false);
 
-    if (!list || strlen(list) == 0) {
-        // Save everything if nothing is listed
-        return true;
+    psHash *keep = psHashAlloc(list->n); // Hash with strings to keep
+    for (int i = 0; i < keep->n; i++) {
+        psHashAdd(keep, list->data[i], list->data[i]);
     }
-
-    psArray *keepList = psStringSplitArray(list, " ,;", false); // List of items to keep
-    psHash *keep = psHashAlloc(keepList->n); // Hash with strings to keep
-    for (int i = 0; i < keep->n; i++) {
-        psHashAdd(keep, keepList->data[i], keepList->data[i]);
-    }
-    psFree(keepList);
 
     psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); // Iterator
@@ -57 +52 @@
     }
 
-    return configCull(config->recipes, save);
+    psArray *keep = psStringSplitArray(save, " ,;", false); // List of items to keep
+
+    bool result = configCull(config->recipes, keep); // Result of culling
+    psFree(keep);
+
+    return result;
 }
 
@@ -70 +70 @@
       }
 
-      return configCull(cameras, config->cameraName);
+      // Get names of the root camera and its derivatives
+      psArray *keep = psArrayAlloc(4);
+      keep->data[0] = pmConfigCameraRootName(config->cameraName);
+      keep->data[1] = pmConfigCameraChipName(config->cameraName);
+      keep->data[2] = pmConfigCameraFPAName(config->cameraName);
+      keep->data[3] = pmConfigCameraSkycellName(config->cameraName);
+
+      bool result = configCull(cameras, keep); // Result of culling
+      psFree(keep);
+
+      return result;
 }