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

Timestamp:

May 12, 2008, 11:52:18 AM (18 years ago)

Author:

Paul Price

Message:

If no sources are present when writing, write an empty table. This is
an attempt to keep the image (for which data exists, or we wouldn't be
calling this function) and the source list consistent, even if there
are no sources found on the image.

File:

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

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-04-08 18:35:38 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-05-12 21:52:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -259 +259 @@
     // XXX if sources is NULL, skip the cell or write out empty tables?
     psArray *sources = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.SOURCES");
-    if (sources == NULL)
-        return true;
+    if (!sources) {
+        sources = psArrayAlloc(0);
+        psMetadataAddArray(readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_META_REPLACE,
+                           "Blank array of sources", sources);
+        psFree(sources);                // Held onto by the metadata, so we can continue to use
+    }
 
     switch (file->type) {
@@ -468 +472 @@
         psFree (headname);
         psFree (dataname);
-        psFree (xsrcname);
-        psFree (xfitname);
+        psFree (xsrcname);
+        psFree (xfitname);
         psFree (outhead);
         break;