Changeset 23286 for trunk/psModules/src/config/pmConfigRecipes.c

Timestamp:

Mar 11, 2009, 4:51:19 PM (17 years ago)

Author:

Paul Price

Message:

config->recipes should hold the recipes that are in the SYSTEM definition. That way, we can write them out in the configuration dump, and load them back in.

File:

• trunk/psModules/src/config/pmConfigRecipes.c (modified) (6 diffs)

trunk/psModules/src/config/pmConfigRecipes.c

@@ -11 +11 @@
 #include "pmConfigRecipes.h"
 
-static bool loadRecipeSystem(bool *status, pmConfig *config, psMetadata *source);
+static bool loadRecipeSystem(bool *status, pmConfig *config);
 static bool loadRecipeCamera(bool *status, pmConfig *config, psMetadata *source);
 static bool loadRecipeSymbols(bool *status, pmConfig *config, pmRecipeSource source);
@@ -56 +56 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    if (!config->recipes) {
-        config->recipes = psMetadataAlloc();
-    }
-
     // Read the recipe file names from the system configuration and camera configuration
     // It is an error for config->system:recipes not to exist.  all programs install their
     // master recipe files in the system:recipe location when they are built.
     psAssert(config->system, "base config data defined");
-    if (source & PM_RECIPE_SOURCE_SYSTEM) {
-        if (!loadRecipeSystem(&status, config, config->system)) {
+    if (!config->recipes || (source & PM_RECIPE_SOURCE_SYSTEM)) {
+        if (!loadRecipeSystem(&status, config)) {
             psError(PS_ERR_IO, false, "Failed to read recipes from system config");
             return false;
@@ -321 +317 @@
 // Load the recipe files for SYSTEM : REQUIRED
 static bool loadRecipeSystem(bool *status,
-                           pmConfig *config, // The configuration into which to read the recipes
-                           psMetadata *source // The source configuration, from which to read the filenames
+                           pmConfig *config // The configuration into which to read the recipes
     )
 {
@@ -329 +324 @@
     *status = false;
 
-    if (!source) {
+    if (!config->system) {
         psError(PS_ERR_IO, true,
                 "The system configuration has not been read --- cannot read recipes from this location.\n");
@@ -336 +331 @@
     }
 
-    psMetadata *recipes = psMetadataLookupMetadata(NULL, source, "RECIPES"); // The list of recipes
-    if (!recipes) {
-        psError(PS_ERR_IO, false, "RECIPES not found in the system configuration\n");
-        return false;
-    }
-
-    // Copy contents of the filenames to config->recipes from the "RECIPES" metadata in the source.
-    // We could use psMetadataCopy for this, but it's better to check that everything's of the correct type.
-    // If it's not of the correct type, we can tell the user which file it's in, so they can find it easier.
-    psMetadataIterator *recipesIter = psMetadataIteratorAlloc(recipes, PS_LIST_HEAD, NULL); // Iterator
+    if (!config->recipes) {
+        config->recipes = psMemIncrRefCounter(psMetadataLookupMetadata(NULL, config->system, "RECIPES")); // The list of recipes
+        if (!config->recipes) {
+            psError(PS_ERR_IO, false, "RECIPES not found in the system configuration\n");
+            return false;
+        }
+    }
+
+    // Read in the component recipes
+    psMetadataIterator *recipesIter = psMetadataIteratorAlloc(config->recipes, PS_LIST_HEAD, NULL); // Iterator
     psMetadataItem *item = NULL;        // MD item containing the filename, from recipe iteration
     while ((item = psMetadataGetAndIncrement(recipesIter))) {
@@ -353 +348 @@
             psFree(recipesIter);
             return false;
-        }
-
-        // add the contents of this recipe file to config->recipes
-        psMetadataAdd(config->recipes, PS_LIST_TAIL, item->name, PS_DATA_METADATA | PS_META_REPLACE,
-                      item->comment, item->data.md);
+        }
     }
     psFree(recipesIter);