Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 1993)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 1994)
@@ -17,6 +17,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-06 01:08:17 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-07 02:01:44 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -188,5 +188,5 @@
     // Test C - Read named hdr from complex FITS file
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file");
-    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", 0, "header_2.fits");
+    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", -1, "header_2.fits");
     printMetadata(metadata3);
     printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
@@ -225,5 +225,9 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extNum",
                             "FITS error while locating header 22: tried to move past end of file", 0);
-    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null when invalid ext given.");
+        return 10;
+    }
     printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extNum", true);
 
@@ -232,6 +236,21 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use bad extName",
                             "FITS error while locating header AARGH: illegal HDU number", 0);
-    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
+    metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null invalid extname give.");
+        return 11;
+    }
     printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
+
+
+    // Test I1 - Attempt to use a valid named extension with invalid extnum
+    printNegativeTestHeader(stdout, "psMetadata", "Test I1 - Read named hdr w/ invalid extnum",
+                            "If extName specified, extNum should be -1.", 0);
+    metadata1 = psMetadataReadHeader(NULL, "MY_DATA_2", 0, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
+        return 12;
+    }
+    printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
 
 
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1993)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1994)
@@ -11,2 +11,4 @@
 <DATE><TIME>|<HOST>|E|psMetadataReadHeader
     FITS error while locating header AARGH: illegal HDU number
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    If extName specified, extNum arguments should be -1.
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1993)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1994)
@@ -173,4 +173,15 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test I1 - Read named hdr w/ invalid extnum}     *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: If extName specified, extNum should be -1.                 *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> 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 J - Free psMetadata}                       *
 *             TestType: Positive                                                   *
Index: /trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1993)
+++ /trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1994)
@@ -17,6 +17,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-10-06 01:08:17 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-07 02:01:44 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -188,5 +188,5 @@
     // Test C - Read named hdr from complex FITS file
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file");
-    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", 0, "header_2.fits");
+    metadata3 = psMetadataReadHeader(metadata3, "MY_DATA_2", -1, "header_2.fits");
     printMetadata(metadata3);
     printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
@@ -225,5 +225,9 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test H - Attempt to use bad extNum",
                             "FITS error while locating header 22: tried to move past end of file", 0);
-    psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null when invalid ext given.");
+        return 10;
+    }
     printFooter(stdout, "psMetadata", "Test H - Attempt to use bad extNum", true);
 
@@ -232,6 +236,21 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test I - Attempt to use bad extName",
                             "FITS error while locating header AARGH: illegal HDU number", 0);
-    psMetadataReadHeader(metadata1, "AARGH", 0, "header_2.fits");
+    metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null invalid extname give.");
+        return 11;
+    }
     printFooter(stdout, "psMetadata", "Test I - Attempt to use bad extName", true);
+
+
+    // Test I1 - Attempt to use a valid named extension with invalid extnum
+    printNegativeTestHeader(stdout, "psMetadata", "Test I1 - Read named hdr w/ invalid extnum",
+                            "If extName specified, extNum should be -1.", 0);
+    metadata1 = psMetadataReadHeader(NULL, "MY_DATA_2", 0, "header_2.fits");
+    if (metadata1 != NULL ) {
+        psError(__func__,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum");
+        return 12;
+    }
+    printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);