Changeset 16542 for branches/eam_branch_20080219/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Feb 19, 2008, 10:09:10 AM (18 years ago)

Author:

eugene

Message:

re-vamping config to define user/site/system

File:

• branches/eam_branch_20080219/psModules/src/camera/pmFPAfileDefine.c (modified) (2 diffs)

branches/eam_branch_20080219/psModules/src/camera/pmFPAfileDefine.c

@@ -155 +155 @@
     } else {
         bool mdok;                      // Status of MD lookup
-        psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); // Known cameras
+        psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->xxSystem, "CAMERAS"); // Known cameras
         if (!mdok || !cameras) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n");
+            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the system configuration.\n");
             return NULL;
         }
@@ -163 +163 @@
         if (!mdok || !camera) {
             psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find automatically generated "
-                    "camera configuration %s in site configuration.\n", cameraName);
+                    "camera configuration %s in system configuration.\n", cameraName);
             return NULL;
         }