Changeset 6714

Timestamp:

Mar 27, 2006, 4:17:08 PM (20 years ago)

Author:

magnier

Message:

added PS_META_NO_REPLACE concept

Location:

branches/rel10_ifa/psLib/src/types

Files:

• psMetadata.c (modified) (2 diffs)
• psMetadata.h (modified) (2 diffs)

branches/rel10_ifa/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.99.4.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-09 02:00:21 $
+ *  @version $Revision: 1.99.4.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-28 02:17:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -528 +528 @@
         } else {
             // default is to error on duplicate entry.
+            if ((flags & PS_META_NO_REPLACE) != 0) {
+                return true;
+            }
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                     PS_ERRORTEXT_psMetadata_DUPLICATE_NOT_ALLOWED);

branches/rel10_ifa/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.74.4.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-16 08:13:16 $
+*  @version $Revision: 1.74.4.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-28 02:17:08 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -59 +59 @@
     PS_META_DEFAULT = 0,               ///< default behaviour (duplicate entry is an error)
     PS_META_REPLACE = 0x1000000,       ///< allow entry to be replaced
-    PS_META_DUPLICATE_OK = 0x2000000,  ///< allow duplicate entries
-    PS_META_NULL = 0x4000000           ///< psMetadataItem.data is a NULL value
+    PS_META_NO_REPLACE = 0x2000000,    ///< duplicate entry is silently skipped
+    PS_META_DUPLICATE_OK = 0x4000000,  ///< allow duplicate entries
+    PS_META_NULL = 0x8000000           ///< psMetadataItem.data is a NULL value
 } psMetadataFlags;