Index: /trunk/psLib/test/astronomy/tst_psMetadata_02.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 1842)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 1843)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 23:49:50 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -109,5 +109,5 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to add metadata item to null metadata",
                             "Null metadata collection not allowed", 0);
-    psMetadataAddItem(NULL, PS_LIST_HEAD, item1);
+    psMetadataAddItem(NULL, item1, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test E - Attempt to add metadata item to null metadata", true);
 
@@ -116,5 +116,5 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to add null metadata item to metadata",
                             "Null metadata item not allowed", 0);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, NULL);
+    psMetadataAddItem(metadata, NULL, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test F - Attempt to add null metadata item to metadata", true);
 
Index: /trunk/psLib/test/astronomy/tst_psMetadata_03.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 1842)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 1843)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-09 20:20:02 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -85,6 +85,6 @@
     // Test B - Remove items from metadata by name
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2);
+    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
     psMetadataRemove(metadata, 0, "myItem1" );
     psMetadataRemove(metadata, 0, "myItem2" );
@@ -94,6 +94,6 @@
     // Test C - Remove items from metadata by index
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item3);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item4);
+    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     psMetadataRemove(metadata, 0, NULL);
     psMetadataRemove(metadata, 0, NULL );
Index: /trunk/psLib/test/astronomy/tst_psMetadata_04.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 1842)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 1843)
@@ -17,6 +17,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 23:50:57 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -84,8 +84,8 @@
     printMetadataItem(item3);
     printMetadataItem(item4);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item3);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item4);
+    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
 
Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 1842)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 1843)
@@ -11,6 +11,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 01:39:37 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80,8 +80,8 @@
     printMetadataItem(item3);
     printMetadataItem(item4);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item3);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item4);
+    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
 
Index: /trunk/psLib/test/astronomy/tst_psMetadata_06.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 1842)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 1843)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 23:22:24 $
+*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87,6 +87,6 @@
     // Test B - Add leaf node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1a);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1b);
+    psMetadataAddItem(metadata, item1a, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item1b, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node", true);
 
@@ -94,5 +94,5 @@
     // Test C - Add leaf node to existing folder node
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1c);
+    psMetadataAddItem(metadata, item1c, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test C - Add leaf node to existing folder node", true);
 
@@ -100,6 +100,6 @@
     // Test D - Add folder node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2a);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2b);
+    psMetadataAddItem(metadata, item2a, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2b, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node", true);
 
Index: /trunk/psLib/test/collections/tst_psMetadata_02.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_02.c	(revision 1842)
+++ /trunk/psLib/test/collections/tst_psMetadata_02.c	(revision 1843)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 23:49:50 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -109,5 +109,5 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to add metadata item to null metadata",
                             "Null metadata collection not allowed", 0);
-    psMetadataAddItem(NULL, PS_LIST_HEAD, item1);
+    psMetadataAddItem(NULL, item1, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test E - Attempt to add metadata item to null metadata", true);
 
@@ -116,5 +116,5 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test F - Attempt to add null metadata item to metadata",
                             "Null metadata item not allowed", 0);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, NULL);
+    psMetadataAddItem(metadata, NULL, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test F - Attempt to add null metadata item to metadata", true);
 
Index: /trunk/psLib/test/collections/tst_psMetadata_03.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_03.c	(revision 1842)
+++ /trunk/psLib/test/collections/tst_psMetadata_03.c	(revision 1843)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-09 20:20:02 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -85,6 +85,6 @@
     // Test B - Remove items from metadata by name
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2);
+    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
     psMetadataRemove(metadata, 0, "myItem1" );
     psMetadataRemove(metadata, 0, "myItem2" );
@@ -94,6 +94,6 @@
     // Test C - Remove items from metadata by index
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item3);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item4);
+    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     psMetadataRemove(metadata, 0, NULL);
     psMetadataRemove(metadata, 0, NULL );
Index: /trunk/psLib/test/collections/tst_psMetadata_04.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_04.c	(revision 1842)
+++ /trunk/psLib/test/collections/tst_psMetadata_04.c	(revision 1843)
@@ -17,6 +17,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 23:50:57 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -84,8 +84,8 @@
     printMetadataItem(item3);
     printMetadataItem(item4);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item3);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item4);
+    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
 
Index: /trunk/psLib/test/collections/tst_psMetadata_05.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 1842)
+++ /trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 1843)
@@ -11,6 +11,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 01:39:37 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80,8 +80,8 @@
     printMetadataItem(item3);
     printMetadataItem(item4);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item3);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item4);
+    psMetadataAddItem(metadata, item1, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item3, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item4, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
 
Index: /trunk/psLib/test/collections/tst_psMetadata_06.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_06.c	(revision 1842)
+++ /trunk/psLib/test/collections/tst_psMetadata_06.c	(revision 1843)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-10 23:22:24 $
+*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-09-21 23:24:42 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87,6 +87,6 @@
     // Test B - Add leaf node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1a);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1b);
+    psMetadataAddItem(metadata, item1a, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item1b, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node", true);
 
@@ -94,5 +94,5 @@
     // Test C - Add leaf node to existing folder node
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item1c);
+    psMetadataAddItem(metadata, item1c, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test C - Add leaf node to existing folder node", true);
 
@@ -100,6 +100,6 @@
     // Test D - Add folder node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node");
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2a);
-    psMetadataAddItem(metadata, PS_LIST_HEAD, item2b);
+    psMetadataAddItem(metadata, item2a, PS_LIST_HEAD);
+    psMetadataAddItem(metadata, item2b, PS_LIST_HEAD);
     printFooter(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node", true);