Changeset 5000 for trunk/psLib/src/types

Timestamp:

Sep 12, 2005, 11:36:54 AM (21 years ago)

Author:

drobbin

Message:

Added xml support for psTime data

Location:

trunk/psLib/src/types

Files:

• psMetadata.c (modified) (3 diffs)
• psMetadata.h (modified) (4 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-10 00:16:59 $
+ *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-12 21:36:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -247 +247 @@
     case PS_META_MULTI:
     case PS_META_ARRAY:
+    case PS_META_TIME:
         // Copy of input data not performed due to variability of data types
         metadataItem->data.V = psMemIncrRefCounter(va_arg(argPtr, psPtr));
@@ -440 +441 @@
 METADATA_ADD_TYPE(Metadata,psMetadata*,PS_META_META)
 METADATA_ADD_TYPE(Array,psArray*,PS_META_ARRAY)
+METADATA_ADD_TYPE(Time,psTime*,PS_META_TIME)
 
 bool psMetadataRemove(psMetadata *md,

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-31 02:07:12 $
+*  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-12 21:36:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "psHash.h"
 #include "psList.h"
-#include "psImage.h"
+#include "psTime.h"
 #include "psLookupTable.h"
 
@@ -53 +53 @@
     PS_META_MULTI,                     ///< Used internally, do not create an metadata item of this type.
     PS_META_META,                      ///< Metadata data (Stored as item.data.md).
-    PS_META_ARRAY                      ///< Array data (Stored as item.data.V).
+    PS_META_ARRAY,                     ///< Array data (Stored as item.data.V).
+    PS_META_TIME                       ///< psTime data (Stored as item.data.V).
 } psMetadataType;
 #define PS_META_IS_PRIMITIVE(TYPE) \
@@ -440 +441 @@
 );
 
+/** Add a Time to metadata collection.
+ *
+ *  @return psBool:  True for success, False for failure.
+ */
+psBool psMetadataAddTime(
+    psMetadata* md,                    ///< Metadata collection to insert metadata item
+    long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    const char* name,                  ///< Name of metadata item
+    int format,                        ///< psMetadataFlag options/flags
+    const char* comment,               ///< Comment for metadata item
+    psTime* value                      ///< Time for metadata item data
+);
+
 /** Add a Hash to metadata collection.
  *