Changeset 12542

Timestamp:

Mar 22, 2007, 5:34:04 AM (19 years ago)

Author:

magnier

Message:

check for and print all psMetadataItems which fail psMetadataUpdate

File:

• trunk/psLib/src/types/psMetadata.c (modified) (3 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.156 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-22 01:14:52 $
+ *  @version $Revision: 1.157 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-22 15:34:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -496 +496 @@
     PS_ASSERT_METADATA_NON_NULL(out, NULL);
 
+    bool result = true;
+
     psMetadataIterator *iter = psMetadataIteratorAlloc(in, PS_LIST_HEAD, NULL);
     psMetadataItem *inItem = NULL;
@@ -508 +510 @@
         psTrace("psLib.types", 5, "Copying %s (%s)...\n", inItem->name, inItem->comment);
 
-        // Copy the item and add it on
+        // Copy the item and add it on.  report all errors so we get a listing
         psMetadataItem *newItem = psMetadataItemCopy(inItem); // Copied item
         if (!psMetadataAddItem(out, newItem, PS_LIST_TAIL, flag)) {
-            psError(PS_ERR_UNKNOWN, false, "Error copying %s (%s) in the metadata\n", 
-                    inItem->name, inItem->comment);
-            psFree(newItem);
-            psFree(iter);
-            return false;
+            fprintf (stderr, "Error copying %s\n", inItem->name);
+            result = false;
         }
         psFree(newItem);                // Drop reference
     }
     psFree(iter);
-    return true;
+
+    if (!result) {
+        psError(PS_ERR_UNKNOWN, false, "failed to update metadata\n");
+    }               
+    return result;
 }