Changeset 7923

Timestamp:

Jul 17, 2006, 4:49:48 PM (20 years ago)

Author:

Paul Price

Message:

Fixing up return values: don't return false unless there's a real error.

Location:

trunk/psModules/src

Files:

• camera/pmFPARead.c (modified) (1 diff)
• concepts/pmConceptsRead.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -322 +322 @@
     pmHDU *hdu = pmHDUFromCell(cell);   // The HDU
     if (!hdu) {
-        return false;                    // Nothing to see here; move along
+        return true;                    // We read everything we could
     }
     if (!hdu->images && !pmHDURead(hdu, fits)) {

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -181 +181 @@
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
-        psError(PS_ERR_UNKNOWN, true, "Can't find HDU for fpa, chip or cell");
-        return false;
+        // We read the defaults for all the HDUs we could find
+        return true;
     }
     psMetadata *cameraFormat = hdu->format; // The camera format
@@ -351 +351 @@
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
     if (!hdu) {
-        return false;
+        // We read the database for all the HDUs we could find
+        return true;
     }
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *dbSpec = psMetadataLookupMD(&mdok, cameraFormat, "DATABSE"); // The DATABASE spec
+    psMetadata *dbSpec = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
     if (!mdok || !dbSpec) {
+        psError(PS_ERR_IO, true, "Unable to find DATABASE in camera configuration.\n");
         return false;
     }