Changeset 7791

Timestamp:

Jul 3, 2006, 11:18:30 AM (20 years ago)

Author:

Paul Price

Message:

Fixed bug in symbolic links for recipes: the site recipes and the
command-line recipes might be read in an initial pass, with the
symbolic links on the command-line resolving to those in the site
recipes. If the function is called again, now with a camera
configuration from which to read recipes, the symbolic links on the
command-line might properly refer to the camera configuration (since
it has higher priority than the site configuration), but they had
already been derived from the site configuration. To get around this,
added a new type, P_PM_RECIPE_SOURCE_SYMBOLIC, and check for this type
every time we read a new set of recipes.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (5 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-29 20:39:56 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-03 21:18:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -666 +666 @@
     config->recipesRead |= sourceType;
 
+    // Having read that, we now need to check to see if any symbolic links need to be resolved
+    recipesIter = psMetadataIteratorAlloc(config->recipesSource, PS_LIST_HEAD, NULL);
+    psMetadataItem *sourceItem = NULL;  // Item containing source, from iteration
+    while ((sourceItem = psMetadataGetAndIncrement(recipesIter))) {
+        assert(sourceItem->type == PS_TYPE_S32); // It should be this type: we put it in ourselves
+        if (sourceItem->data.S32 == P_PM_RECIPE_SOURCE_SYMBOLIC) {
+            const char *linkName = sourceItem->comment; // The name of the link
+            psMetadata *linkSource = psMetadataLookupMD(&mdok, config->recipes, linkName); // The source
+            if (!mdok || !linkSource) {
+                psLogMsg(__func__, PS_LOG_WARN, "Unable to resolve symbolic link for recipe %s to %s "
+                         "--- ignored.\n", sourceItem->name, linkName);
+                continue;
+            }
+            psMetadataItem *target = psMetadataLookup(config->recipes, sourceItem->name); // The target item
+            assert(target);             // It had better be here: it's in the "sourcesRead" metadata
+            psFree(target->data.V); // Free old copy
+            target->data.V = psMetadataCopy(NULL, linkSource);
+        }
+    }
+    psFree(recipesIter);
     return true;
 }
@@ -709 +729 @@
 
             // Command-line has the highest priority, so we don't have to check to see if it's already there
-            psMetadataAddS32(config->recipesSource, PS_LIST_TAIL, recipeName, PS_META_REPLACE,
-                             "Recipe added from command line", P_PM_RECIPE_SOURCE_CL);
 
             // Is the source a symbolic reference?
@@ -720 +738 @@
                               comment, extant);
                 psFree(comment);
+                // Put the source in the comment, so we can retrieve it again if we need it
+                psMetadataAddS32(config->recipesSource, PS_LIST_TAIL, recipeName, PS_META_REPLACE,
+                                 recipeSource, P_PM_RECIPE_SOURCE_SYMBOLIC);
+
             } else {
                 // Otherwise, treat the source as a filename
@@ -730 +752 @@
                     psFree(comment);
                     psFree(recipe);                 // Drop reference
+                    psMetadataAddS32(config->recipesSource, PS_LIST_TAIL, recipeName, PS_META_REPLACE,
+                                     "Recipe added from command line", P_PM_RECIPE_SOURCE_CL);
                 }
             }