Changeset 16611 for trunk/psModules/src/config/pmConfigCamera.c

Timestamp:

Feb 22, 2008, 10:21:52 AM (18 years ago)

Author:

eugene

Message:

using new user/site/system construction for config files

File:

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

trunk/psModules/src/config/pmConfigCamera.c

@@ -24 +24 @@
 
 // Generate the skycell version of a named camera configuration
-bool pmConfigCameraSkycellVersion(psMetadata *site, // The site configuration
+bool pmConfigCameraSkycellVersion(psMetadata *system, // The system configuration
                                   const char *name // Name of the un-mosaicked camera
                                   )
 {
-    PS_ASSERT_METADATA_NON_NULL(site, false);
+    PS_ASSERT_METADATA_NON_NULL(system, false);
     PS_ASSERT_STRING_NON_EMPTY(name, false);
 
     bool mdok;                          // Status of MD lookup
-    psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
+    psMetadata *cameras = psMetadataLookupMetadata(&mdok, system, "CAMERAS"); // List of cameras
     if (!mdok || !cameras) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n");
-        return false;
-    }
-    if (!pmConfigGenerateSkycellVersion(cameras, cameras, name, site)) {
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the system configuration.\n");
+        return false;
+    }
+    if (!pmConfigGenerateSkycellVersion(cameras, cameras, name, system)) {
         psError(PS_ERR_UNKNOWN, true, "Failed to build skycell camera description for %s\n", name);
         return false;
@@ -45 +45 @@
 
 
-bool pmConfigCameraSkycellVersionsAll(psMetadata *site)
-{
-    PS_ASSERT_METADATA_NON_NULL(site, false);
+bool pmConfigCameraSkycellVersionsAll(psMetadata *system)
+{
+    PS_ASSERT_METADATA_NON_NULL(system, false);
 
     bool mdok;                          // Status of MD lookup
-    psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
+    psMetadata *cameras = psMetadataLookupMetadata(&mdok, system, "CAMERAS"); // List of 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 false;
     }
@@ -61 +61 @@
     while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
         assert(camerasItem->type == PS_DATA_METADATA); // Only metadata are allowed here!
-        if (!pmConfigGenerateSkycellVersion(cameras, new, camerasItem->name, site)) {
+        if (!pmConfigGenerateSkycellVersion(cameras, new, camerasItem->name, system)) {
             psError(PS_ERR_UNKNOWN, true, "Failed to build skycell camera description for %s\n",
                     camerasItem->name);
@@ -92 +92 @@
 static const char *skycellConceptName(const char *name, // Name of concept
                                       const char **concepts, // List of concepts NOT to update
-                                      const psMetadata *site // Site configuration
+                                      const psMetadata *system // System configuration
                                       )
 {
@@ -101 +101 @@
     }
 
-    if (!site) {
+    if (!system) {
         return name;
     }
     bool mdok;                          // Status of MD lookup
-    psMetadata *skycells = psMetadataLookupMetadata(&mdok, site, "SKYCELLS"); // Skycell concept headers
+    psMetadata *skycells = psMetadataLookupMetadata(&mdok, system, "SKYCELLS"); // Skycell concept headers
     if (!skycells) {
         return name;
@@ -121 +121 @@
                                     psMetadata *newCameras, // New list of camera configurations
                                     const char *name, // Name of original camera configuration
-                                    const psMetadata *site // Site configuration
+                                    const psMetadata *system // System configuration
                                     )
 {
@@ -213 +213 @@
         iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
         while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsFPA, site); // Name for skycell
+            const char *new = skycellConceptName(name, skycellConceptsFPA, system); // Name for skycell
             if (new) {
                 psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
@@ -224 +224 @@
         iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
         while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsChip, site); // Name for skycell
+            const char *new = skycellConceptName(name, skycellConceptsChip, system); // Name for skycell
             if (new) {
                 psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
@@ -235 +235 @@
         iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
         while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsCell, site); // Name for skycell
+            const char *new = skycellConceptName(name, skycellConceptsCell, system); // Name for skycell
             if (new) {
                 psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
@@ -299 +299 @@
 
 // Generate the Chip and FPA mosaicked version of a named camera configuration
-bool pmConfigCameraMosaickedVersions(psMetadata *site, // The site configuration
+bool pmConfigCameraMosaickedVersions(psMetadata *system, // The system configuration
                                      const char *name // Name of the un-mosaicked camera
                                     )
 {
-    PS_ASSERT_METADATA_NON_NULL(site, false);
+    PS_ASSERT_METADATA_NON_NULL(system, false);
     PS_ASSERT_STRING_NON_EMPTY(name, false);
 
     bool mdok;                          // Status of MD lookup
-    psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
+    psMetadata *cameras = psMetadataLookupMetadata(&mdok, system, "CAMERAS"); // List of 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 false;
     }
@@ -325 +325 @@
 // the operation putting the new entries first is now implemented in pmConfigGenerateMosaickedVersion
 // Generate the Chip and FPA mosaicked version of a named camera configuration
-bool pmConfigCameraMosaickedVersionsAll(psMetadata *site)
-{
-    PS_ASSERT_METADATA_NON_NULL(site, false);
+bool pmConfigCameraMosaickedVersionsAll(psMetadata *system)
+{
+    PS_ASSERT_METADATA_NON_NULL(system, false);
 
     bool mdok;                          // Status of MD lookup
-    psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras
+    psMetadata *cameras = psMetadataLookupMetadata(&mdok, system, "CAMERAS"); // List of 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 false;
     }