Index: trunk/psLib/src/collections/psMetadata.h
===================================================================
--- trunk/psLib/src/collections/psMetadata.h	(revision 1289)
+++ trunk/psLib/src/collections/psMetadata.h	(revision 1313)
@@ -10,18 +10,18 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-23 18:52:05 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-28 23:50:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
-# ifndef PS_METADATA_H
-# define PS_METADATA_H
-
-#include "psType.h"
-#include "psList.h"
-#include "psHash.h"
+#ifndef PS_METADATA_H
+#define PS_METADATA_H
+
 
 /// @addtogroup Metadata
 /// @{
+
+/** Maximum length of time string */
+#define MAX_STRING_LENGTH 256
 
 /** Metadata item type.
@@ -36,5 +36,5 @@
     PS_META_STR,                        ///< String data (Stored in as void *).
     PS_META_IMG,                        ///< Image data (Stored in as void *).
-    PS_META_JPG,                        ///< JPEG data (Stored in as void .
+    PS_META_JPEG,                       ///< JPEG data (Stored in as void .
     PS_META_PNG,                        ///< PNG data (Stored in as void *).
     PS_META_ASTROM,                     ///< Astrometric coefficients (Stored in as void *).
@@ -43,14 +43,4 @@
 } psMetadataType;
 
-/** Metadata item flags.
- *
- * Enumeration for maintaining optional metadata item flags.
- */
-typedef enum {
-    PS_META_TYPE_MASK  =  0xffff,       ///< Mask to hold metadata type enum.
-    PS_META_UNIQUE     = 0x10000,       ///< Metadata item name is unique (default).
-    PS_META_NON_UNIQUE = 0x20000        ///< Metadata item name may be repeated.
-}psMetadataFlags;
-
 /** Metadata item data structure.
  *
@@ -63,6 +53,5 @@
     char *restrict name;                ///< Name of metadata item.
     psMetadataType type;                ///< Type of metadata item.
-    psMetadataFlags flags;              ///< Flags associated with metadata item
-    const union
+    union
     {
         psS32   S32;                    ///< Signed 32-bit integer data.
@@ -70,6 +59,5 @@
         psF64   F64;                    ///< Double-precision float data.
         psPTR     V;                    ///< Pointer to other type of data.
-    }
-    data;                               ///< Union for data types.
+    }data;                              ///< Union for data types.
     char *comment;                      ///< Optional comment ("", not NULL).
     psList *restrict items;             ///< List of psMetadataItems with same name.
@@ -86,5 +74,5 @@
 {
     psList *restrict list;
-    psList *restrict table;
+    psHash *restrict table;
 }
 psMetadata;
@@ -110,5 +98,5 @@
 psMetadataItem *psMetadataItemAlloc(
     const char *name,                   ///< Name of metadata item.
-    int format,                         ///< Binary OR combination of metadata type and metadata flag.
+    psMetadataType type,                ///< Type of metadata item.
     const char *comment,                ///< Comment for metadata item.
     ...                                 ///< Arguments for name formatting and metadata item data.
@@ -130,5 +118,5 @@
 psMetadataItem *psMetadataItemAllocV(
     const char *name,                   ///< Name of metadata item.
-    int format,                         ///< Binary OR combination of metadata type and metadata flag.
+    psMetadataType type,                ///< Type of metadata item.
     const char *comment,                ///< Comment for metadata item.
     va_list list                        ///< Arguments for name formatting and metadata item data.
@@ -151,5 +139,5 @@
  * @return bool: True for success, false for failure.
  */
-bool *psMetadataAddItem(
+bool psMetadataAddItem(
     psMetadata *restrict md,            ///< Metadata collection to insert metadat item.
     int where,                          ///< Location to be added.
@@ -163,9 +151,9 @@
  * @return bool: True for success, false for failure.
  */
-bool *psMetadataAdd(
+bool psMetadataAdd(
     psMetadata *restrict md,            ///< Metadata collection to insert metadat item.
     int where,                          ///< Location to be added.
     const char *name,                   ///< Name of metadata item.
-    int format,                         ///< Binary OR combination of metadata type and metadata flag.
+    psMetadataType type,                ///< Type of metadata item.
     const char *comment,                ///< Comment for metadata item.
     ...                                 ///< Arguments for name formatting and metadata item data.
@@ -181,5 +169,5 @@
  * @return bool: True for success, false for failure.
  */
-bool *psMetadataRemove(
+bool psMetadataRemove(
     psMetadata *restrict md,            ///< Metadata collection to insert metadat item.
     int where,                          ///< Location to be removed.
@@ -257,5 +245,5 @@
 void psMetadataItemPrint(
     FILE *fd,                           ///< Pointer to file to write metadata item.
-    const char *format,                 ///< Format to print metadat item.
+    const char *format,                 ///< Format to print metadata item.
     const psMetadataItem *restrict md   ///< Metadata item to print.
 );