Changeset 15183 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Oct 3, 2007, 11:53:54 AM (19 years ago)

Author:

Paul Price

Message:

Missed some text when resolving conflict.

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -222 +222 @@
     file->save = false;
 
-    // Use the camera we were told to, the camera of the provided FPA, or default to the default camera
-    psMetadata *camera;                 // Camera configuration
-    if (!cameraName || strlen(cameraName) == 0) {
-        if (fpa && fpa->camera) {
-            camera = (psMetadata*)fpa->camera; // Casting away const, so I can put it in the file
-        } else {
-            camera = config->camera;
-            cameraName = config->cameraName;
-        }
-    } else {
-        bool mdok;                      // Status of MD lookup
-        psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); // Known cameras
-        if (!mdok || !cameras) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n");
-            return NULL;
-        }
-        camera = psMetadataLookupMetadata(&mdok, cameras, cameraName); // Camera configuration of interest
-        if (!mdok || !camera) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find automatically generated "
-                    "camera configuration %s in site configuration.\n", cameraName);
-            return NULL;
-        }
-
-        if (fpa && fpa->camera && fpa->camera != camera) {
-            psAbort("Camera of bound FPA is not the requested camera --- there is an inconsistency!");
-        }
-    }
     file->camera = psMemIncrRefCounter(camera);
     file->cameraName = psMemIncrRefCounter(cameraName);