Changeset 14611

Timestamp:

Aug 22, 2007, 2:52:15 PM (19 years ago)

Author:

magnier

Message:

correctly set the cameraName; disallow command-line -camera to specify a file (must be an entry in config->site

File:

• branches/eam_branch_20070817/psModules/src/config/pmConfig.c (modified) (9 diffs)

branches/eam_branch_20070817/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-15 20:21:18 $
+ *  @version $Revision: 1.101.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-23 00:52:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -295 +295 @@
 // Read the calibrations for a camera
 static bool cameraReadCalibrations(psMetadata *camera, // Camera for which to read the formats
-                                   const char *name // Name of the camera, for error messages
+                                   const char *cameraName // Name of the camera, for error messages
     )
 {
     assert(camera);
-    assert(name);
+    assert(cameraName);
 
     psMetadataItem *darkNorm = psMetadataLookup(camera, "DARK.NORM"); // The dark normalisation calibration
@@ -305 +305 @@
         if (darkNorm->type == PS_DATA_STRING) {
             const char *darkNormName = darkNorm->data.str; // The file name
-            psTrace("config", 2, "Reading %s dark normalisation: %s\n", name, darkNormName);
+            psTrace("config", 2, "Reading %s dark normalisation: %s\n", cameraName, darkNormName);
             psMetadata *new = NULL;         // New metadata
             if (!pmConfigFileRead(&new, darkNormName, "Dark normalisation")) {
                 psError(PM_ERR_CONFIG, false, "Trouble reading reading %s dark normalisation %s --- "
-                        "ignored.\n", name, darkNormName);
+                        "ignored.\n", cameraName, darkNormName);
                 psFree(new);
                 return false;
@@ -320 +320 @@
             darkNorm->data.md = new;
         } else if (darkNorm->type != PS_DATA_METADATA) {
-            psWarning("DARK.NORM in camera %s is not of type STR or METADATA (%x)", name, darkNorm->type);
+            psWarning("DARK.NORM in camera %s is not of type STR or METADATA (%x)", cameraName, darkNorm->type);
         }
     } else {
@@ -541 +541 @@
                      "ignored.\n");
         } else {
-            char *cameraFile = argv[argNum]; // The camera configuration file to read
-
-            // look for a symbolic camera name in the CAMERAS metadata
-            // otherwise fall back to trying the -camera option as a literal
-            // filename
             bool mdok = true;           // Status of MD lookup
+            char *cameraName = argv[argNum]; // symbolic name of the camera
+
+            // look for the CAMERAS list in config->site
             psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS");
-            if (mdok && cameras) {
-                char *newFile = psMetadataLookupStr(NULL, cameras, cameraFile); // The filename
-                if (newFile) {
-                    cameraFile = newFile;
-                } else {
-                    psLogMsg ("psModules.config", PS_LOG_INFO, 
-                              "%s is not listed in the site CAMERAS list,\n"
-                              "trying as a camera configuration file\n", cameraFile);
-                }
-            } else {
+            if (!cameras) {
                 psError(PS_ERR_IO, false, "Unable to find CAMERAS in site configuration.\n");
                 psFree(config);
@@ -563 +552 @@
             }
 
-            if (!pmConfigFileRead(&config->camera, cameraFile, "camera")) {
-                psError(PM_ERR_CONFIG, false, "Problem reading %s", cameraFile);
+            // look for the symbolic camera name in the CAMERAS metadata
+            char *cameraFile = psMetadataLookupStr(&mdok, cameras, cameraName); // The filename
+            if (!cameraFile) {
+                psError(PS_ERR_IO, false, "%s is not listed in the site CAMERAS list\n", cameraName);
                 psFree(config);
                 return NULL;
             }
 
+            // load this camera's configuration informatoin
+            if (!pmConfigFileRead(&config->camera, cameraFile, "camera")) {
+                psError(PM_ERR_CONFIG, false, "Problem reading %s", cameraName);
+                psFree(config);
+                return NULL;
+            }
+            // save the name for future uses
+            config->cameraName = psStringCopy (cameraName);
+            
             psArgumentRemove(argNum, argc, argv);
 
@@ -580 +580 @@
 
             // Read in any camera-specific calibrations
-            if (!cameraReadCalibrations(config->camera, cameraFile)) {
+            if (!cameraReadCalibrations(config->camera, cameraName)) {
                 psError(PS_ERR_UNKNOWN, false,
                         "Unable to read calibrations within camera configuration %s.\n",
-                        cameraFile);
+                        cameraName);
                 psFree(config);
                 return NULL;
             }
 
-            psMetadataAddMetadata(cameras, PS_LIST_HEAD, cameraFile, PS_META_REPLACE,
+            psMetadataAddMetadata(cameras, PS_LIST_HEAD, cameraName, PS_META_REPLACE,
                                   "Camera specified on command line", config->camera);
 
-            if (!pmConfigCameraSkycellVersion(config->site, cameraFile)) {
+            if (!pmConfigCameraSkycellVersion(config->site, cameraName)) {
                 psError(PS_ERR_UNKNOWN, false,
                         "Unable to generate skycell versions of specified camera %s.\n",
-                        cameraFile);
+                        cameraName);
                 psFree(config);
                 return NULL;
             }
 
-            if (!pmConfigCameraMosaickedVersions(config->site, cameraFile)) {
+            if (!pmConfigCameraMosaickedVersions(config->site, cameraName)) {
                 psError(PS_ERR_UNKNOWN, false,
                         "Unable to generate mosaicked versions of specified camera %s.\n",
-                        cameraFile);
+                        cameraName);
                 psFree(config);
                 return NULL;
@@ -875 +875 @@
     assert(camera);
     assert(header);
-    assert(cameraName && strlen(cameraName) > 0);
+    assert(cameraName);
+    assert(*cameraName);
 
     bool result = false;                // Did we find the first match?
@@ -1008 +1009 @@
         psFree(name);
     }
-    return format;
+    return psMemIncrRefCounter(format);
 }