Changeset 7311 for trunk/psModules/src/objects/pmSourceIO.c

Timestamp:

Jun 2, 2006, 3:02:08 PM (20 years ago)

Author:

Paul Price

Message:

Applying RHL patch. Generally improves the error handling and traceback. pmConcepts.c and pmConceptsRead.c done by PAP (RHL did this also, but I had already done them). Resolved conflicts, except for pmFPAfile.c, which uses psAbort in some instances where RHL's patch had psError; leave this for Gene to decide.

File:

• trunk/psModules/src/objects/pmSourceIO.c (modified) (9 diffs)

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-03 00:40:28 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-03 01:02:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
 }
 
-// Given a FITS file pointer, read the table of object data
+// Given a FITS file pointer, write the table of object data
 bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file)
 {
@@ -64 +64 @@
 
     if (view->chip == -1) {
-        pmFPAWriteObjects (fpa, view, file);
+        if (!pmFPAWriteObjects (fpa, view, file)) {
+            psError(PS_ERR_IO, false, "Failed to write objects from fpa");
+            return false;
+        }
         return true;
     }
 
     if (view->chip >= fpa->chips->n) {
+        psError(PS_ERR_UNKNOWN, false, "Writing chip == %d (>= chips->n == %d)", view->chip, fpa->chips->n);
         return false;
     }
@@ -74 +78 @@
 
     if (view->cell == -1) {
-        pmChipWriteObjects (chip, view, file);
+        if (!pmChipWriteObjects (chip, view, file)) {
+            psError(PS_ERR_IO, false, "Failed to write objects from chip");
+            return false;
+        }
         return true;
     }
 
     if (view->cell >= chip->cells->n) {
+        psError(PS_ERR_UNKNOWN, false, "Writing cell == %d (>= cells->n == %d)",
+                view->cell, chip->cells->n);
         return false;
     }
@@ -84 +93 @@
 
     if (view->readout == -1) {
-        pmCellWriteObjects (cell, view, file);
+        if (!pmCellWriteObjects (cell, view, file)) {
+            psError(PS_ERR_IO, false, "Failed to write objects from cell");
+            return false;
+        }
+
         return true;
     }
 
     if (view->readout >= cell->readouts->n) {
+        psError(PS_ERR_UNKNOWN, false, "Writing readout == %d (>= readouts->n == %d)",
+                view->readout, cell->readouts->n);
         return false;
     }
     pmReadout *readout = cell->readouts->data[view->readout];
 
-    pmReadoutWriteObjects (readout, view, file);
+    if (!pmReadoutWriteObjects (readout, view, file)) {
+        psError(PS_ERR_IO, false, "Failed to write objects from readout %d", view->readout);
+        return false;
+    }
+
     return true;
 }
@@ -104 +123 @@
 
         pmChip *chip = fpa->chips->data[i];
-        pmChipWriteObjects (chip, view, file);
+        if (!pmChipWriteObjects (chip, view, file)) {
+            psError(PS_ERR_IO, false, "Failed to write %dth chip", i);
+            return false;
+        }
     }
     return true;
@@ -116 +138 @@
 
         pmCell *cell = chip->cells->data[i];
-        pmCellWriteObjects (cell, view, file);
+        if (!pmCellWriteObjects (cell, view, file)) {
+            psError(PS_ERR_IO, false, "Failed to write %dth cell", i);
+            return false;
+        }
     }
     return true;
@@ -128 +153 @@
 
         pmReadout *readout = cell->readouts->data[i];
-        pmReadoutWriteObjects (readout, view, file);
+        if (!pmReadoutWriteObjects (readout, view, file)) {
+            psError(PS_ERR_IO, false, "Failed to write %dth readout", i);
+            return false;
+        }
     }
     return true;
@@ -181 +209 @@
         psMetadataCopy (outhead, updates);
 
-        pmSourcesWriteCMP (sources, filename, outhead);
+        bool status = pmSourcesWriteCMP (sources, filename, outhead);
         psFree (outhead);
         psFree (filename);
+
+        if (!status) {
+            psError(PS_ERR_IO, false, "Failed to write CMP file\n");
+            return false;
+        }
         break;