Index: /trunk/psLib/test/types/tst_psMetadataIO.c
===================================================================
--- /trunk/psLib/test/types/tst_psMetadataIO.c	(revision 7222)
+++ /trunk/psLib/test/types/tst_psMetadataIO.c	(revision 7223)
@@ -13,6 +13,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-02-24 23:43:16 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-05-25 23:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -963,9 +963,9 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL failed lines arg");
     metadata1 = psMetadataConfigParse(metadata1,NULL,testConfig2,true);
-    if(metadata1 != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for NULL failed lines argument");
+    if(metadata1 == NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return for NULL failed lines argument");
         return 4;
     }
-
+    psFree(metadata1);
     // Attempt parse with NULL file name
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL file name arg");
Index: /trunk/psLib/test/types/verified/tst_psArguments.stdout
===================================================================
--- /trunk/psLib/test/types/verified/tst_psArguments.stdout	(revision 7222)
+++ /trunk/psLib/test/types/verified/tst_psArguments.stdout	(revision 7223)
@@ -7,10 +7,11 @@
 Optional arguments, with default values:
     -string    (SomeString)      Test String
+    -float     (0.000000e+00)    Test Float
     -int       (1)               Int1
                (2)               Int2
-    -float     (0.000000e+00)    Test Float
-Updating -string
     -string (Test String): new
-    -int (Int1): 1
-    -int (Int2): 2
     -float (Test Float): 0.000000
+    -int (Integers): 
+     int1 (Int1): 1
+     int2 (Int2): 2
+
Index: /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr
===================================================================
--- /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr	(revision 7222)
+++ /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr	(revision 7223)
@@ -58,6 +58,40 @@
 <DATE><TIME>|<HOST>|I|testMetadataParseConfig1
     Following should generate an error message for NULL failed lines arg
-<DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
-    Unallowable operation: nFail is NULL.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to parse the value 'X' of metadata item boolean, type BOOL, on line 2 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to read a metadata value on line 4 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to read a metadata value on line 7 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to parse the value 'x,y,z' of metadata item @vector1, type U8, on line 8 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to read a metadata type on line 9 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to read a metadata value on line 9 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to parse the value '' of metadata item @vector3, type F8, on line 10 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Duplicate MULTI specifier on line 14 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Metadata type 'CELL', found on line 17 of test2.config, is invalid.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to parse the value 'aabb' of metadata item value1, type F64, on line 20 of test2.config.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to parse the value 'ccdd' of metadata item value2, type S32, on line 21 of test2.config.
+<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
+    More than one '@' character not allowed.  Found on line 24 of test2.config.
+<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
+    Failed to read a metadata type on line 27 of test2.config.
+<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
+    Specified type, CELL, on line 31 of test2.config is already defined.
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
+    Duplicate metadata item name is not allowed.  Use a psMetadataFlags option to allow such action.
+<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
+    Metadata type 'NEWCELL', found on line 37 of test2.config, is invalid.
+<DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO)
+    Failed to read a metadata OURCELL on line 40 of test2.config.
+<DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO)
+    Metadata type 'NEWCELL1', found on line 43 of test2.config, is invalid.
 <DATE><TIME>|<HOST>|I|testMetadataParseConfig1
     Following should generate an error message for NULL file name arg
Index: /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout	(revision 7222)
+++ /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout	(revision 7223)
@@ -12,8 +12,12 @@
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               0  Key Comment: number of data axes
- Key Name:   SIMPLE  Key mdType: 0x00001301  Key Value:               1  Key Comment: file does conform to FITS standard
- Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               0  Key Comment: number of data axes
+ Key Name:   SIMPLE  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   SIMPLE  Key mdType: 0x00001301  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
@@ -40,12 +44,17 @@
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment: 
-    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
-    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
  Key Name:  HISTORY  Key mdType: 0x00010020  Key Value:                  Key Comment: 
     Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
@@ -53,5 +62,6 @@
     Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:  EXTNAME  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_1'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -75,14 +85,21 @@
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
  Key Name:  HISTORY  Key mdType: 0x00010020  Key Value:                  Key Comment: 
     Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:  EXTNAME  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -106,11 +123,18 @@
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:    NAXIS  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key mdType: 0x00010020  Key Value:                  Key Comment: 
+    Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test D - Remove items with same name from all metadata} | tst_psMetadata_01.c)