Changeset 9539 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Oct 13, 2006, 11:22:09 AM (20 years ago)

Author:

Paul Price

Message:

Fixing psLib APIs following clean-up.

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-10 01:03:13 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:15:45 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -277 +277 @@
             // filename
             bool mdok = true;           // Status of MD lookup
-            psMetadata *cameras = psMetadataLookupMD(&mdok, config->site, "CAMERAS");
+            psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS");
             if (mdok && cameras) {
                 char *newFile = psMetadataLookupStr(NULL, cameras, cameraFile); // The filename
@@ -377 +377 @@
     // XXX: This is not spec'ed in the SDRS.
     //
-    psMetadata *trace = psMetadataLookupMD(&mdok, config->site, "TRACE");
+    psMetadata *trace = psMetadataLookupMetadata(&mdok, config->site, "TRACE");
     if (mdok && trace) {
         psMetadataIterator *traceIter = psMetadataIteratorAlloc(trace, PS_LIST_HEAD, NULL); // Iterator
@@ -446 +446 @@
     // Read the rule for that camera format
     bool mdStatus = true;
-    psMetadata *rule = psMetadataLookupMD(&mdStatus, cameraFormat, "RULE");
+    psMetadata *rule = psMetadataLookupMetadata(&mdStatus, cameraFormat, "RULE");
     if (! mdStatus || ! rule) {
         psLogMsg(__func__, PS_LOG_WARN, "Unable to read rule for camera.\n");
@@ -493 +493 @@
     // Read the list of formats
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS"); // List of formats
+    psMetadata *formats = psMetadataLookupMetadata(&mdok, camera, "FORMATS"); // List of formats
     if (!mdok || !formats) {
         psLogMsg(__func__, PS_LOG_WARN, "Unable to find list of FORMATS in camera %s --- ignored\n",
@@ -550 +550 @@
     // If we don't know what sort of camera we have, we try all that we know
     if (! config->camera) {
-        psMetadata *cameras = psMetadataLookupMD(&mdok, config->site, "CAMERAS");
+        psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS");
         if (! mdok) {
             psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration.");
@@ -615 +615 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    psMetadata *cameras = psMetadataLookupMD(NULL, config->site, "CAMERAS");
+    psMetadata *cameras = psMetadataLookupMetadata(NULL, config->site, "CAMERAS");
     if (!cameras) {
         psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration.");
@@ -659 +659 @@
 
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *recipes = psMetadataLookupMD(&mdok, source, "RECIPES"); // The list of recipes
+    psMetadata *recipes = psMetadataLookupMetadata(&mdok, source, "RECIPES"); // The list of recipes
     if (!mdok || !recipes) {
         psLogMsg(__func__, PS_LOG_WARN, "RECIPES in the %s is not of type METADATA --- ignored\n",
@@ -720 +720 @@
             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
+                psMetadata *linkSource = psMetadataLookupMetadata(&mdok, config->recipes, linkName); // The source
                 if (!mdok || !linkSource) {
                     // Can't yet resolve it
@@ -794 +794 @@
 
             // Is the source a symbolic reference?
-            psMetadata *extant = psMetadataLookupMD(&mdok, config->recipes, recipeSource); // Does it exist?
+            psMetadata *extant = psMetadataLookupMetadata(&mdok, config->recipes, recipeSource); // Does it exist?
             if (mdok && extant) {
                 psString comment = psStringCopy("Recipe added from command line as symbolic link to ");
@@ -889 +889 @@
 
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *rules = psMetadataLookupMD(&mdok, format, "RULE"); // How to identify this format
+    psMetadata *rules = psMetadataLookupMetadata(&mdok, format, "RULE"); // How to identify this format
     if (!mdok || !rules) {
         psError(PS_ERR_IO, true, "Unable to find RULE in camera format.\n");