Changeset 7312

Timestamp:

Jun 2, 2006, 3:07:40 PM (20 years ago)

Author:

Paul Price

Message:

Resolving conflicts from both RHL and I adding error checking.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -137 +137 @@
     }
     fpa->hdu = psMemIncrRefCounter(hdu);
-    if (hdu->header) {
-        if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL)) {
-            psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for FPA");
-            return false;
-        }
+    bool success = true;                // Success of reading concepts
+    if (hdu->header && !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
+        success = false;
     }
     pmFPASetFileStatus(fpa, true);
 
-    return true;
+    return success;
 }
 
@@ -164 +163 @@
     }
     chip->hdu = psMemIncrRefCounter(hdu);
-    if (hdu->header) {
-        pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, NULL);
+    bool success = true;                // Success of reading concepts
+    if (hdu->header && !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
+        success = false;
     }
     pmChipSetFileStatus(chip, true);
 
-    return true;
+    return success;
 }
 
@@ -188 +189 @@
     }
     cell->hdu = psMemIncrRefCounter(hdu);
-    if (hdu->header) {
-        pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL);
+    bool success = true;                // Success of reading concepts
+    if (hdu->header && !pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
+        success = false;
     }
     pmCellSetFileStatus(cell, true);
 
-    return true;
+    return success;
 }
 
@@ -339 +342 @@
         }
         newCell->config = psMemIncrRefCounter(cellData);
-        if (!pmConceptsReadCell(newCell, PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS, false, NULL)) {
-            psError(PS_ERR_IO, false, "Reading concepts for cell %d", numCells);
+        if (!pmConceptsReadCell(newCell, PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS,
+                                false, NULL)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from camera and defaults for chip %s, "
+                    "cell %s, type %s.  Attempting to proceed anyway...\n", chipName, cellName, cellType);
             return -1;
         }
@@ -735 +740 @@
     psFree(contentsIter);
 
-    pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, NULL);
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, NULL)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from defaults for FPA %s.  Attempting to "
+                "proceed anyway.\n", currentFPAname);
+    }
 
     return view;