Changeset 5194

Timestamp:

Sep 29, 2005, 1:30:32 PM (21 years ago)

Author:

drobbin

Message:

Added fxns psMetadataRemoveIndex and RemoveKey. Tested.

Location:

trunk/psLib

Files:

• pslib.kdevelop (modified) (1 diff)
• src/types/psMetadata.c (modified) (2 diffs)
• src/types/psMetadata.h (modified) (2 diffs)
• test/types/tst_psMetadata_07.c (modified) (3 diffs)

trunk/psLib/pslib.kdevelop

@@ -49 +49 @@
         <envvar value="1" name="WANT_AUTOMAKE_1_6" />
       </envvars>
-      <abortonerror>false</abortonerror>
-      <numberofjobs>2</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
     </make>
   </kdevautoproject>

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-26 21:13:26 $
+ *  @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-29 23:30:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -536 +536 @@
 }
 
+bool psMetadataRemoveKey(psMetadata *md,
+                         const char *key)
+{
+    return ( psMetadataRemove(md, PS_LIST_HEAD, key) );
+}
+
+bool psMetadataRemoveIndex(psMetadata *md,
+                           int location)
+{
+    return ( psMetadataRemove(md, location, NULL) );
+}
+
 psMetadataItem* psMetadataLookup(const psMetadata *md,
                                  const char *key)

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-29 01:15:38 $
+*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-29 23:30:32 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -501 +501 @@
 );
 
+/** Removes an item from metadata by key name.
+ *
+ *  @return bool:  True for success, false for failure.
+ */
+bool psMetadataRemoveKey(
+    psMetadata *md,                    ///< Metadata collection to remove metadata item.
+    const char *key                    ///< Name of metadata key.
+);
+
+/** Removes an item from metadata by index number.
+ *
+ *  @return bool:  True for success, false for failure.
+ */
+bool psMetadataRemoveIndex(
+    psMetadata *md,                    ///< Metadata collection to remove metadata item.
+    int location                       ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+);
+
+
 /** Find an item in the metadata collection based on key name.
  *

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -9 +9 @@
 *     Test D - Get and Decrement a psMetadataIterator
 *     Test E - psMetadataConfigWrite (also tests psMetadataConfigFormat)
+*     Test F - psMetadataRemoveKey, RemoveIndex
 *
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-09-23 02:39:06 $
+*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-09-29 23:30:32 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25 +26 @@
 static psS32 testMetaIter(void);
 static psS32 testMetaWrite(void);
+static psS32 testMetaRemove(void);
 
 testDescription tests[] = {
                               {testMetaIter, 0, "Test psMetadataIterator fxns", 0, false},
                               {testMetaWrite, 0, "Test psMetadataConfigWrite", 0, false},
+                              {testMetaRemove, 0, "Test psMetadataRemoveKey/Index", 0, false},
                               {NULL}
                           };
@@ -137 +140 @@
     return 0;
 }
+
+psS32 testMetaRemove(void)
+{
+    psMetadata *md = NULL;
+    md = setupMeta();
+    if ( !psMetadataRemoveKey(md, "item1") ) {
+        fprintf(stderr, "Failed to remove item1 from psMetadata.\n");
+        return 1;
+    }
+    if ( !psMetadataRemoveIndex(md, PS_LIST_HEAD) ) {
+        fprintf(stderr, "Failed to remove item2 from psMetadata.\n");
+        return 2;
+    }
+    psFree(md);
+    return 0;
+}