Index: /trunk/psLib/test/types/verified/tst_psMetadata_01.stderr
===================================================================
--- /trunk/psLib/test/types/verified/tst_psMetadata_01.stderr	(revision 7295)
+++ /trunk/psLib/test/types/verified/tst_psMetadata_01.stderr	(revision 7296)
@@ -1,14 +1,0 @@
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
-    Unallowable operation: fileName is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
-    FITS error while opening file: missing.dat could not open the named file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
-    Couldn't close FITS file. FITS error: NULL input pointer
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
-    Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
-    FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
-    FITS error while locating header AARGH: illegal HDU number
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
-    Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
Index: /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout	(revision 7295)
+++ /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout	(revision 7296)
@@ -1,216 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test A - Read 1st hdr from simple FITS file}    *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-Contents of metadata list:
- 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:    NAXIS  Key mdType: 0x00000104  Key Value:               0  Key Comment: number of data axes
- Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-
-Contents of metadata table:
- 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)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test B - Read 2nd hdr from complex FITS file}   *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-Contents of metadata list:
- Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
- 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:   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_1'  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:  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>
-
-Contents of metadata table:
- 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>
-    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:  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: 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)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test C - Read named hdr from complex FITS file} *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-Contents of metadata list:
- Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
- 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:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  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>
-
-Contents of metadata table:
- 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: 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)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test D - Remove items with same name from all metadata} *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-Removed HISTORY from all metadata from prior test. Resulting metadata:
-
-Contents of metadata list:
- Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
- 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:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key mdType: 0x00010000  Key Value:     'MY_DATA_2'  Key Comment: 
-
-Contents of metadata table:
- 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)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test E - Attempt to use null filename}          *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: Null fileName not allowed                                  *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test E - Attempt to use null filename} | tst_psMetadata_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test F - Attempt to open nonexistant file}      *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: FITS error while opening file: missing.dat...Couldn't close FITS file... *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test F - Attempt to open nonexistant file} | tst_psMetadata_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test G - Attempt to use two null inputs}        *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: Null extName and extNum = 0 not allowed                    *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test G - Attempt to use two null inputs} | tst_psMetadata_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test H - Attempt to use bad extNum}             *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: FITS error while locating header 22: tried to move past end of file *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test H - Attempt to use bad extNum} | tst_psMetadata_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test I - Attempt to use bad extName}            *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: FITS error while locating header AARGH: illegal HDU number *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test I - Attempt to use bad extName} | tst_psMetadata_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test J - Read named hdr w/ invalid extnum}      *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: If extName specified, extNum should be -1.                 *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test J - Read named hdr w/ invalid extnum} | tst_psMetadata_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test K - Free psMetadata}                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psMetadata{Test K - Free psMetadata} | tst_psMetadata_01.c)
-