Index: /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 2611)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 2612)
@@ -38,7 +38,5 @@
     More than one '~' character not allowed.  Found on line 120 of test.config.
 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
-    Duplicate Metadata item, speed, found on line 128 of test.config.  Overwrite not allowed.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
     Unallowable operation: fileName is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
-    Failed to open file 'abcedfg'.  Check if it exists and it has the proper permissions.
+    Failed to open file 'abcedfg'. Check if it exists and it has the proper permissions.
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout	(revision 2611)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout	(revision 2612)
@@ -6,43 +6,42 @@
 
 Failed lines: 6 Expected: 6
-
 Contents of metadata list:
- Key Name:       pi  Key Type:  4  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key Type:  2  Key Value:           10000  Key Comment: 
- Key Name:     time  Key Type:  3  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key Type:  1  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key Type:  5  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key Type:  5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key Type:  6  Key Value: 2 3 5 7 11 13 17 Key Comment: These are prime numbers
- Key Name: negatives  Key Type:  6  Key Value: -1 -2 -3 -4 -5 -6 -7 Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:            This  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:              is  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:              an  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:             but  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:           still  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key Type:  3  Key Value:          66.660  Key Comment: 
+ Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key pType: 256  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
+ Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key Type:  0  Key Value:                  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key Type:  5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key Type:  3  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key Type:  6  Key Value: -1 -2 -3 -4 -5 -6 -7 Key Comment: 
- Key Name:       pi  Key Type:  4  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key Type:  1  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key Type:  6  Key Value: 2 3 5 7 11 13 17 Key Comment: These are prime numbers
- Key Name: altitude  Key Type:  2  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key Type:  3  Key Value:          66.660  Key Comment: 
- Key Name:   title1  Key Type:  5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
+ Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key pType: 256  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
+ Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
+ Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read config file with overwrite set true} | tst_psMetadataIO.c)
@@ -54,43 +53,42 @@
 \**********************************************************************************/
 
-Failed lines: 7 Expected: 7
-Contents of metadata list:
- Key Name:       pi  Key Type:  4  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key Type:  2  Key Value:           10000  Key Comment: 
- Key Name:     time  Key Type:  3  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key Type:  1  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key Type:  5  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key Type:  5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key Type:  6  Key Value: 2 3 5 7 11 13 17 Key Comment: These are prime numbers
- Key Name: negatives  Key Type:  6  Key Value: -1 -2 -3 -4 -5 -6 -7 Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:            This  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:              is  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:              an  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:             but  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:           still  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key Type:  3  Key Value:          55.550  Key Comment: 
+Failed lines: 7 Expected: 7 Contents of metadata list:
+ Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key pType: 256  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
+ Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          55.550  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key Type:  0  Key Value:                  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key Type:  5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key Type:  3  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key Type:  6  Key Value: -1 -2 -3 -4 -5 -6 -7 Key Comment: 
- Key Name:       pi  Key Type:  4  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key Type:  1  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key Type:  6  Key Value: 2 3 5 7 11 13 17 Key Comment: These are prime numbers
- Key Name: altitude  Key Type:  2  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key Type:  3  Key Value:          55.550  Key Comment: 
- Key Name:   title1  Key Type:  5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
+ Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key pType: 256  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
+ Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          55.550  Key Comment: 
+ Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read config file with overwrite set false} | tst_psMetadataIO.c)
@@ -102,43 +100,42 @@
 \**********************************************************************************/
 
-Failed lines: 7 Expected: 7
-Contents of metadata list:
- Key Name:       pi  Key Type:  4  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key Type:  2  Key Value:           10000  Key Comment: 
- Key Name:     time  Key Type:  3  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key Type:  1  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key Type:  5  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key Type:  5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key Type:  6  Key Value: 2 3 5 7 11 13 17 Key Comment: These are prime numbers
- Key Name: negatives  Key Type:  6  Key Value: -1 -2 -3 -4 -5 -6 -7 Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:            This  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:              is  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:              an  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:             but  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:           still  Key Comment: 
- Key Name:  comment  Key Type:  5  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key Type:  3  Key Value:          55.550  Key Comment: 
+Failed lines: 6 Expected: 6 Contents of metadata list:
+ Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key pType: 256  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
+ Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
+ Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key Type:  0  Key Value:                  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key Type:  5  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key Type:  5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key Type:  3  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key Type:  6  Key Value: -1 -2 -3 -4 -5 -6 -7 Key Comment: 
- Key Name:       pi  Key Type:  4  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key Type:  1  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key Type:  6  Key Value: 2 3 5 7 11 13 17 Key Comment: These are prime numbers
- Key Name: altitude  Key Type:  2  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key Type:  3  Key Value:          55.550  Key Comment: 
- Key Name:   title1  Key Type:  5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
+    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
+ Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key pType: 256  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
+ Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
+ Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read config file without auto-allocation of metadata} | tst_psMetadataIO.c)
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 2611)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 2612)
@@ -1,14 +1,18 @@
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader
-    Null fileName not allowed
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
+    Unexpected null pointer for psList parameter.
+<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
+    Unexpected null pointer for psList parameter.
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+    Unallowable operation: fileName is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     FITS error while opening file: missing.dat could not open the named file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     Couldn't close FITS file. FITS error: NULL input pointer
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader
-    Null extName and extNum = 0 not allowed
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+    Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
     FITS error while locating header AARGH: illegal HDU number
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader
-    If extName specified, extNum arguments should be -1.
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+    Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 2611)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 2612)
@@ -6,14 +6,14 @@
 
 Contents of metadata list:
- Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
- Key Name:   BITPIX  Key Type:  2  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key Type:  2  Key Value:               0  Key Comment: number of data axes
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:   SIMPLE  Key pType: 256  Key mdType: 0  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T11:11:18
 
 Contents of metadata table:
- Key Name:    NAXIS  Key Type:  2  Key Value:               0  Key Comment: number of data axes
- Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
- Key Name:   BITPIX  Key Type:  2  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
+ Key Name:   SIMPLE  Key pType: 256  Key mdType: 0  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T11:11:18
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
@@ -26,32 +26,32 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_1'  Key Comment: 
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:14:45
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:15:29
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:18
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:46
 
 Contents of metadata table:
- Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key Type:  0  Key Value:                  Key Comment: 
-    Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
-    Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  HISTORY  Key Type:  0  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+    Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:14:45
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:15:29
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:18
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:21:46
+ Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_1'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -64,25 +64,25 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:12
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:52
 
 Contents of metadata table:
- Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key Type:  0  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:12
+    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:52
+ Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -97,20 +97,22 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:12
+ Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T13:22:52
 
 Contents of metadata table:
- Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test D - Remove items with same name from all metadata} | tst_psMetadata_01.c)
@@ -173,5 +175,5 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test I1 - Read named hdr w/ invalid extnum}     *
+*            TestPoint: psMetadata{Test J - Read named hdr w/ invalid extnum}      *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: If extName specified, extNum should be -1.                 *
@@ -180,13 +182,13 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test J - Read named hdr w/ invalid extnum} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test J - Free psMetadata}                       *
+*            TestPoint: psMetadata{Test K - Free psMetadata}                       *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psMetadata{Test J - Free psMetadata} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test K - Free psMetadata} | tst_psMetadata_01.c)