Index: /trunk/psLib/configure.ac
===================================================================
--- /trunk/psLib/configure.ac	(revision 4208)
+++ /trunk/psLib/configure.ac	(revision 4209)
@@ -9,5 +9,5 @@
 AM_MAINTAINER_MODE
 
-PSLIB_LT_VERSION="0:5:0"
+PSLIB_LT_VERSION="0:6:0"
 AC_SUBST(PSLIB_LT_VERSION,$PSLIB_LT_VERSION)
 
Index: /trunk/psLib/src/astro/psTime.c
===================================================================
--- /trunk/psLib/src/astro/psTime.c	(revision 4208)
+++ /trunk/psLib/src/astro/psTime.c	(revision 4209)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-31 21:47:46 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-10 18:09:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -256,5 +256,5 @@
 
     // Read time config file
-    timeMetadata = psMetadataParseConfig(timeMetadata, &nFail, fileName, true);
+    timeMetadata = psMetadataConfigParse(timeMetadata, &nFail, fileName, true);
     if(timeMetadata == NULL) {
         return false;
Index: /trunk/psLib/src/astronomy/psTime.c
===================================================================
--- /trunk/psLib/src/astronomy/psTime.c	(revision 4208)
+++ /trunk/psLib/src/astronomy/psTime.c	(revision 4209)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-31 21:47:46 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-10 18:09:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -256,5 +256,5 @@
 
     // Read time config file
-    timeMetadata = psMetadataParseConfig(timeMetadata, &nFail, fileName, true);
+    timeMetadata = psMetadataConfigParse(timeMetadata, &nFail, fileName, true);
     if(timeMetadata == NULL) {
         return false;
Index: /trunk/psLib/src/collections/psMetadataIO.c
===================================================================
--- /trunk/psLib/src/collections/psMetadataIO.c	(revision 4208)
+++ /trunk/psLib/src/collections/psMetadataIO.c	(revision 4209)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-04 03:00:39 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-10 18:09:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1075,5 +1075,5 @@
 }
 
-psMetadata* psMetadataParseConfig(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
+psMetadata* psMetadataConfigParse(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
 {
     FILE*               fp                   = NULL;
@@ -1516,5 +1516,5 @@
 }
 
-psMetadata*  psMetadataParseConfigXml(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
+psMetadata*  psMetadataConfigParseXml(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
 {
     xmlSAXHandler saxHandler;
Index: /trunk/psLib/src/collections/psMetadataIO.h
===================================================================
--- /trunk/psLib/src/collections/psMetadataIO.h	(revision 4208)
+++ /trunk/psLib/src/collections/psMetadataIO.h	(revision 4209)
@@ -10,6 +10,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-10 18:09:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -71,5 +71,5 @@
  *  @return psMetadata* : Resulting metadata from read.
  */
-psMetadata* psMetadataParseConfig(
+psMetadata* psMetadataConfigParse(
     psMetadata* md,                    ///< Resulting metadata from read.
     psU32 *nFail,                      ///< Number of failed lines.
@@ -85,5 +85,5 @@
  */
 
-psMetadata*  psMetadataParseConfigXml(
+psMetadata*  psMetadataConfigParseXml(
     psMetadata* md,                    ///< Resulting metadata from read.
     psU32 *nFail,                      ///< Number of failed lines.
Index: /trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.c	(revision 4208)
+++ /trunk/psLib/src/types/psMetadataConfig.c	(revision 4209)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-04 03:00:39 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-10 18:09:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1075,5 +1075,5 @@
 }
 
-psMetadata* psMetadataParseConfig(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
+psMetadata* psMetadataConfigParse(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
 {
     FILE*               fp                   = NULL;
@@ -1516,5 +1516,5 @@
 }
 
-psMetadata*  psMetadataParseConfigXml(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
+psMetadata*  psMetadataConfigParseXml(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
 {
     xmlSAXHandler saxHandler;
Index: /trunk/psLib/src/types/psMetadataConfig.h
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.h	(revision 4208)
+++ /trunk/psLib/src/types/psMetadataConfig.h	(revision 4209)
@@ -10,6 +10,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-10 18:09:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -71,5 +71,5 @@
  *  @return psMetadata* : Resulting metadata from read.
  */
-psMetadata* psMetadataParseConfig(
+psMetadata* psMetadataConfigParse(
     psMetadata* md,                    ///< Resulting metadata from read.
     psU32 *nFail,                      ///< Number of failed lines.
@@ -85,5 +85,5 @@
  */
 
-psMetadata*  psMetadataParseConfigXml(
+psMetadata*  psMetadataConfigParseXml(
     psMetadata* md,                    ///< Resulting metadata from read.
     psU32 *nFail,                      ///< Number of failed lines.
Index: /trunk/psLib/src/xml/psXML.c
===================================================================
--- /trunk/psLib/src/xml/psXML.c	(revision 4208)
+++ /trunk/psLib/src/xml/psXML.c	(revision 4209)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-04 03:00:39 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-10 18:09:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1075,5 +1075,5 @@
 }
 
-psMetadata* psMetadataParseConfig(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
+psMetadata* psMetadataConfigParse(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
 {
     FILE*               fp                   = NULL;
@@ -1516,5 +1516,5 @@
 }
 
-psMetadata*  psMetadataParseConfigXml(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
+psMetadata*  psMetadataConfigParseXml(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite)
 {
     xmlSAXHandler saxHandler;
Index: /trunk/psLib/src/xml/psXML.h
===================================================================
--- /trunk/psLib/src/xml/psXML.h	(revision 4208)
+++ /trunk/psLib/src/xml/psXML.h	(revision 4209)
@@ -10,6 +10,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-10 18:09:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -71,5 +71,5 @@
  *  @return psMetadata* : Resulting metadata from read.
  */
-psMetadata* psMetadataParseConfig(
+psMetadata* psMetadataConfigParse(
     psMetadata* md,                    ///< Resulting metadata from read.
     psU32 *nFail,                      ///< Number of failed lines.
@@ -85,5 +85,5 @@
  */
 
-psMetadata*  psMetadataParseConfigXml(
+psMetadata*  psMetadataConfigParseXml(
     psMetadata* md,                    ///< Resulting metadata from read.
     psU32 *nFail,                      ///< Number of failed lines.
Index: /trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr	(revision 4208)
+++ /trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr	(revision 4209)
@@ -14,5 +14,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
+<DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
     Failed to open file 'zzz'. Check if it exists and it has the proper permissions.
 <DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
Index: /trunk/psLib/test/collections/tst_psMetadataIO.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 4208)
+++ /trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 4209)
@@ -13,6 +13,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-06-04 02:59:56 $
+ *  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-06-10 18:09:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,9 +31,9 @@
 
 testDescription tests[] = {
-                              {testMetadataParseConfig,000,"psMetadataParseConfig",0,false},
-                              {testMetadataParseConfig1,000,"psMetadataParseConfig",0,false},
-                              {testMetadataParseConfig2,000,"psMetadataParseConfig",0,false},
-                              {testMetadataParseConfig3,000,"psMetadataParseConfig",0,false},
-                              {testMetadataParseConfig4,000,"psMetadataParseConfig",0,false},
+                              {testMetadataParseConfig,000,"psMetadataConfigParse",0,false},
+                              {testMetadataParseConfig1,000,"psMetadataConfigParse",0,false},
+                              {testMetadataParseConfig2,000,"psMetadataConfigParse",0,false},
+                              {testMetadataParseConfig3,000,"psMetadataConfigParse",0,false},
+                              {testMetadataParseConfig4,000,"psMetadataConfigParse",0,false},
                               {NULL}
                           };
@@ -474,5 +474,5 @@
     psLogSetLevel(PS_LOG_INFO);
 
-    if( !runTestSuite(stderr,"psMetadataParseConfig",tests,argc,argv)) {
+    if( !runTestSuite(stderr,"psMetadataConfigParse",tests,argc,argv)) {
         return 1;
     }
@@ -493,5 +493,5 @@
 
     // Read config file test1.config with overwrite set true
-    metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig1,true);
+    metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig1,true);
     // Verify the expected number of failed lines
     if(!checkFailedLines(failedLines,testConfig1FailsOverwrite,(char*)testConfig1)) {
@@ -923,5 +923,5 @@
     // This file contains parse errors
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate parse error message");
-    metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig2,true);
+    metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig2,true);
     // Verify the expected number of failed lines
     if(!checkFailedLines(failedLines,testConfig2Fails,(char*)testConfig2)) {
@@ -937,5 +937,5 @@
     // Attempt parse a non-existant file
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    metadata1 = psMetadataParseConfig(metadata1,&failedLines,"ab.config",true);
+    metadata1 = psMetadataConfigParse(metadata1,&failedLines,"ab.config",true);
     if(metadata1 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for non-existant file");
@@ -945,5 +945,5 @@
     // Attempt parse with NULL failed lines ptr
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL failed lines arg");
-    metadata1 = psMetadataParseConfig(metadata1,NULL,testConfig2,true);
+    metadata1 = psMetadataConfigParse(metadata1,NULL,testConfig2,true);
     if(metadata1 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for NULL failed lines argument");
@@ -953,5 +953,5 @@
     // Attempt parse with NULL file name
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL file name arg");
-    metadata1 = psMetadataParseConfig(metadata1,&failedLines,NULL,true);
+    metadata1 = psMetadataConfigParse(metadata1,&failedLines,NULL,true);
     if(metadata1 != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for NULL filename argument");
@@ -971,5 +971,5 @@
     // Read config file test3.config with overwrite set false
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error of duplicate key names");
-    metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig3,false);
+    metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig3,false);
     // Verify the expected number of failed lines
     if(!checkFailedLines(failedLines,testConfig3Fails,(char*)testConfig3)) {
@@ -991,5 +991,5 @@
 
     // Read config file test4.config with overwrite set false
-    metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig4,false);
+    metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig4,false);
     // Verify the expected number of failed lines
     if(!checkFailedLines(failedLines,testConfig4Fails,(char*)testConfig4)) {
@@ -1010,5 +1010,5 @@
 
     // Read config file test4.config with overwrite set false
-    metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig5,true);
+    metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig5,true);
     // Verify the expected number of failed lines
     if(!checkFailedLines(failedLines,testConfig5Fails,(char*)testConfig5)) {
Index: /trunk/psLib/test/collections/tst_psMetadata_07.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_07.c	(revision 4208)
+++ /trunk/psLib/test/collections/tst_psMetadata_07.c	(revision 4209)
@@ -9,6 +9,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-06-10 18:09:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26,7 +26,7 @@
     psU32 nFail = 0;
     psMetadata *md = NULL;
-    md = psMetadataParseConfigXml(md, &nFail, XML_CONFIG_FILE, true);
+    md = psMetadataConfigParseXml(md, &nFail, XML_CONFIG_FILE, true);
     if (nFail != 0) {
-        printf("psMetadataParseConfigXml returned error %d\n", res);
+        printf("psMetadataConfigParseXml returned error %d\n", res);
     }
 
Index: /trunk/psLib/test/collections/verified/tst_psMetadataIO.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psMetadataIO.stderr	(revision 4208)
+++ /trunk/psLib/test/collections/verified/tst_psMetadataIO.stderr	(revision 4209)
@@ -1,5 +1,5 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadataIO.c                                         *
-*            TestPoint: psMetadataParseConfig{psMetadataParseConfig}               *
+*            TestPoint: psMetadataConfigParse{psMetadataConfigParse}               *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -8,9 +8,9 @@
     Metadata item Float has been replaced
 
----> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c)
+---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadataIO.c                                         *
-*            TestPoint: psMetadataParseConfig{psMetadataParseConfig}               *
+*            TestPoint: psMetadataConfigParse{psMetadataConfigParse}               *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -56,20 +56,20 @@
 <DATE><TIME>|<HOST>|I|testMetadataParseConfig1
     Following should generate error message
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
+<DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
     Failed to open file 'ab.config'. Check if it exists and it has the proper permissions.
 <DATE><TIME>|<HOST>|I|testMetadataParseConfig1
     Following should generate an error message for NULL failed lines arg
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
+<DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
     Unallowable operation: nFail is NULL.
 <DATE><TIME>|<HOST>|I|testMetadataParseConfig1
     Following should generate an error message for NULL file name arg
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
+<DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
     Unallowable operation: fileName is NULL.
 
----> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c)
+---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadataIO.c                                         *
-*            TestPoint: psMetadataParseConfig{psMetadataParseConfig}               *
+*            TestPoint: psMetadataConfigParse{psMetadataConfigParse}               *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -82,9 +82,9 @@
     Failed to add metadata item to metadata collection list.
 
----> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c)
+---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadataIO.c                                         *
-*            TestPoint: psMetadataParseConfig{psMetadataParseConfig}               *
+*            TestPoint: psMetadataConfigParse{psMetadataConfigParse}               *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -93,9 +93,9 @@
     Can not copy a negative number of characters (-9).
 
----> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c)
+---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadataIO.c                                         *
-*            TestPoint: psMetadataParseConfig{psMetadataParseConfig}               *
+*            TestPoint: psMetadataConfigParse{psMetadataConfigParse}               *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -116,4 +116,4 @@
     Metadata type 'CELL6', found on line 31 of test5.config, is invalid.
 
----> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c)
+---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c)