Changeset 14008

Timestamp:

Jul 3, 2007, 3:36:14 PM (19 years ago)

Author:

magnier

Message:

adding psMetadataOverlay function and rudimentary tests

Location:

trunk/psLib

Files:

• src/types/psMetadata.c (modified) (2 diffs)
• src/types/psMetadata.h (modified) (2 diffs)
• test/types/Makefile.am (modified) (1 diff)
• test/types/tap_psMetadataOverlay.c (added)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.161 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-07 00:42:13 $
+ *  @version $Revision: 1.162 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-07-04 01:36:14 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -509 +509 @@
         }
         psTrace("psLib.types", 5, "Copying %s (%s)...\n", inItem->name, inItem->comment);
+
+        // 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)) {
+            fprintf (stderr, "Error copying %s\n", inItem->name);
+            result = false;
+        }
+        psFree(newItem);                // Drop reference
+    }
+    psFree(iter);
+
+    if (!result) {
+        psError(PS_ERR_UNKNOWN, false, "failed to update metadata\n");
+    }
+    return result;
+}
+
+// this function copies the input metadata to the output, supplementing existing metadata 
+// folders with the contents from corresponding folders in the output
+bool p_psMetadataOverlay(const char *file,
+                         unsigned int lineno,
+                         const char *func,
+                         psMetadata *out,
+                         const psMetadata *in)
+{
+    PS_ASSERT_METADATA_NON_NULL(in, NULL);
+    PS_ASSERT_METADATA_NON_NULL(out, NULL);
+
+    bool result = true;
+
+    psMetadataIterator *iter = psMetadataIteratorAlloc(in, PS_LIST_HEAD, NULL);
+    psMetadataItem *inItem = NULL;
+    while ((inItem = psMetadataGetAndIncrement(iter))) {
+        // Need to look for MULTI, which won't be picked up using the iterator.
+        psMetadataItem *multiCheckItem = psMetadataLookup(in, inItem->name);
+        unsigned int flag = PS_META_REPLACE; // Flag to indicate MULTI; otherwise, replace
+        if (multiCheckItem->type == PS_DATA_METADATA_MULTI) {
+            psTrace("psLib.types", 10, "MULTI: %s (%s)\n", inItem->name, inItem->comment);
+            flag = PS_META_DUPLICATE_OK;
+        }
+        psTrace("psLib.types", 5, "Copying %s (%s)...\n", inItem->name, inItem->comment);
+
+        // if this is a metadata, and it has a corresponding match, overlay them
+        if (inItem->type == PS_DATA_METADATA) {
+            bool status;
+            psMetadata *outFolder = psMetadataLookupMetadata (&status, out, inItem->name);
+            if (outFolder) {
+                if (!psMetadataOverlay (outFolder, inItem->data.md)) {
+                    fprintf (stderr, "Error overlaying metadata folder\n");
+                    result = false;
+                }
+                continue;
+            }
+        }
 
         // Copy the item and add it on.  report all errors so we get a listing

trunk/psLib/src/types/psMetadata.h

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-03-22 01:14:52 $
+*  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-07-04 01:36:14 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -507 +507 @@
 
 
+/** Overlays an existing psMetadata collection with elements from a metadata collection
+ *
+ *  Creates a new copy of all the psMetadataItems in the psMetadata collection 'in' and places
+ *  them in out.  matching metadata structures in 'out' are supplemented with corresponding
+ *  entries from 'in'
+ *
+ *  @return psMetadata*:        the copy of the psMetadata container.
+ */
+#ifdef DOXYGEN
+bool psMetadataOverlay(
+    psMetadata *out,                   ///< output Metadata container for copying.
+    const psMetadata *in               ///< Metadata collection to be copied.
+    );
+#else // ifdef DOXYGEN
+bool p_psMetadataOverlay(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psMetadata *out,                    ///< output Metadata container for copying.
+    const psMetadata *in                ///< Metadata collection to be copied.
+    );
+#define psMetadataOverlay(out, in) \
+      p_psMetadataOverlay(__FILE__, __LINE__, __func__, out, in)
+#endif // ifdef DOXYGEN
+
+
 /** Supplements a metadata with an item from another metadata.
  *

trunk/psLib/test/types/Makefile.am

@@ -19 +19 @@
         tap_psMetadataItemParse \
         tap_psMetadataUpdate \
+        tap_psMetadataOverlay \
         tap_psMetadata_printing \
         tap_psMetadata_copying \