Index: /trunk/psLib/src/astronomy/psMetadata.c
===================================================================
--- /trunk/psLib/src/astronomy/psMetadata.c	(revision 2658)
+++ /trunk/psLib/src/astronomy/psMetadata.c	(revision 2659)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 22:58:59 $
+*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 23:27:25 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -521,72 +521,2 @@
     return entry;
 }
-
-psBool psMetadataSetIterator(psMetadata *md, psS32 where)
-{
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    psListSetIterator(md->list, where);
-
-    return true;
-}
-
-psMetadataItem* psMetadataGetNext(psMetadata *md, const char *match, psS32 which)
-{
-    psList* mdList = NULL;
-    psMetadataItem* entry = NULL;
-
-
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    mdList = md->list;
-
-    psListSetIterator(mdList, which);
-    entry = psListGetCurrent(mdList);
-    while (entry != NULL) {
-        if(match != NULL) {
-            if (!strncmp(match, entry->name, strlen(match))) {
-
-                // Match found
-                return entry;
-            }
-            entry = psListGetNext(mdList);
-        } else {
-            entry = psListGetNext(mdList);
-            break;
-        }
-    }
-
-    return entry;
-}
-
-psMetadataItem* psMetadataGetPrevious(psMetadata *md, const char *match, psS32 which)
-{
-    psList* mdList = NULL;
-    psMetadataItem* entry = NULL;
-
-
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    mdList = md->list;
-
-    psListSetIterator(mdList, which);
-    entry = psListGetCurrent(mdList);
-    while (entry != NULL) {
-        if(match != NULL) {
-            if (!strncmp(match, entry->name, strlen(match))) {
-
-                // Match found
-                return entry;
-            }
-            entry = psListGetPrevious(mdList);
-        } else {
-            entry = psListGetPrevious(mdList);
-            break;
-        }
-    }
-
-    return entry;
-}
Index: /trunk/psLib/src/astronomy/psMetadata.h
===================================================================
--- /trunk/psLib/src/astronomy/psMetadata.h	(revision 2658)
+++ /trunk/psLib/src/astronomy/psMetadata.h	(revision 2659)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 22:59:05 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 23:27:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -252,41 +252,4 @@
 );
 
-/** Set or reset metadata iterator.
- *
- *  Metadata may be iterated by setting or resetting an iterator to a location
- *  in the metadata list.
- *
- * @return void: void.
- */
-psBool psMetadataSetIterator(
-    psMetadata*  md,           ///< Metadata collection to iterate.
-    psS32 where                ///< Location of iterator.
-);
-
-/** Get next metadata item.
- *
- * Get next metadata item in iterator list.
- *
- * @return psMetadataItem* : Pointer metadata item.
- */
-psMetadataItem* psMetadataGetNext(
-    psMetadata*  md,           ///< Metadata collection to iterate.
-    const char * match,        ///< Beginning of key name.
-    psS32 which                ///< Iterator to be used.
-);
-
-/** Get previous metadata item.
- *
- * Get previous metadata item in iterator list.
- *
- * @return psMetadataItem* : Pointer metadata item.
- */
-psMetadataItem* psMetadataGetPrevious(
-    psMetadata *md,            ///< Metadata collection to iterate.
-    const char *match,         ///< Beginning of key name.
-    psS32 which                ///< Iterator to be used.
-);
-
-
 /// @}
 
Index: /trunk/psLib/src/collections/psMetadata.c
===================================================================
--- /trunk/psLib/src/collections/psMetadata.c	(revision 2658)
+++ /trunk/psLib/src/collections/psMetadata.c	(revision 2659)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 22:58:59 $
+*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 23:27:25 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -521,72 +521,2 @@
     return entry;
 }
-
-psBool psMetadataSetIterator(psMetadata *md, psS32 where)
-{
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    psListSetIterator(md->list, where);
-
-    return true;
-}
-
-psMetadataItem* psMetadataGetNext(psMetadata *md, const char *match, psS32 which)
-{
-    psList* mdList = NULL;
-    psMetadataItem* entry = NULL;
-
-
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    mdList = md->list;
-
-    psListSetIterator(mdList, which);
-    entry = psListGetCurrent(mdList);
-    while (entry != NULL) {
-        if(match != NULL) {
-            if (!strncmp(match, entry->name, strlen(match))) {
-
-                // Match found
-                return entry;
-            }
-            entry = psListGetNext(mdList);
-        } else {
-            entry = psListGetNext(mdList);
-            break;
-        }
-    }
-
-    return entry;
-}
-
-psMetadataItem* psMetadataGetPrevious(psMetadata *md, const char *match, psS32 which)
-{
-    psList* mdList = NULL;
-    psMetadataItem* entry = NULL;
-
-
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    mdList = md->list;
-
-    psListSetIterator(mdList, which);
-    entry = psListGetCurrent(mdList);
-    while (entry != NULL) {
-        if(match != NULL) {
-            if (!strncmp(match, entry->name, strlen(match))) {
-
-                // Match found
-                return entry;
-            }
-            entry = psListGetPrevious(mdList);
-        } else {
-            entry = psListGetPrevious(mdList);
-            break;
-        }
-    }
-
-    return entry;
-}
Index: /trunk/psLib/src/collections/psMetadata.h
===================================================================
--- /trunk/psLib/src/collections/psMetadata.h	(revision 2658)
+++ /trunk/psLib/src/collections/psMetadata.h	(revision 2659)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 22:59:05 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 23:27:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -252,41 +252,4 @@
 );
 
-/** Set or reset metadata iterator.
- *
- *  Metadata may be iterated by setting or resetting an iterator to a location
- *  in the metadata list.
- *
- * @return void: void.
- */
-psBool psMetadataSetIterator(
-    psMetadata*  md,           ///< Metadata collection to iterate.
-    psS32 where                ///< Location of iterator.
-);
-
-/** Get next metadata item.
- *
- * Get next metadata item in iterator list.
- *
- * @return psMetadataItem* : Pointer metadata item.
- */
-psMetadataItem* psMetadataGetNext(
-    psMetadata*  md,           ///< Metadata collection to iterate.
-    const char * match,        ///< Beginning of key name.
-    psS32 which                ///< Iterator to be used.
-);
-
-/** Get previous metadata item.
- *
- * Get previous metadata item in iterator list.
- *
- * @return psMetadataItem* : Pointer metadata item.
- */
-psMetadataItem* psMetadataGetPrevious(
-    psMetadata *md,            ///< Metadata collection to iterate.
-    const char *match,         ///< Beginning of key name.
-    psS32 which                ///< Iterator to be used.
-);
-
-
 /// @}
 
Index: /trunk/psLib/src/types/psMetadata.c
===================================================================
--- /trunk/psLib/src/types/psMetadata.c	(revision 2658)
+++ /trunk/psLib/src/types/psMetadata.c	(revision 2659)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 22:58:59 $
+*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 23:27:25 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -521,72 +521,2 @@
     return entry;
 }
-
-psBool psMetadataSetIterator(psMetadata *md, psS32 where)
-{
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    psListSetIterator(md->list, where);
-
-    return true;
-}
-
-psMetadataItem* psMetadataGetNext(psMetadata *md, const char *match, psS32 which)
-{
-    psList* mdList = NULL;
-    psMetadataItem* entry = NULL;
-
-
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    mdList = md->list;
-
-    psListSetIterator(mdList, which);
-    entry = psListGetCurrent(mdList);
-    while (entry != NULL) {
-        if(match != NULL) {
-            if (!strncmp(match, entry->name, strlen(match))) {
-
-                // Match found
-                return entry;
-            }
-            entry = psListGetNext(mdList);
-        } else {
-            entry = psListGetNext(mdList);
-            break;
-        }
-    }
-
-    return entry;
-}
-
-psMetadataItem* psMetadataGetPrevious(psMetadata *md, const char *match, psS32 which)
-{
-    psList* mdList = NULL;
-    psMetadataItem* entry = NULL;
-
-
-    PS_PTR_CHECK_NULL(md,NULL);
-    PS_PTR_CHECK_NULL(md->list,NULL);
-
-    mdList = md->list;
-
-    psListSetIterator(mdList, which);
-    entry = psListGetCurrent(mdList);
-    while (entry != NULL) {
-        if(match != NULL) {
-            if (!strncmp(match, entry->name, strlen(match))) {
-
-                // Match found
-                return entry;
-            }
-            entry = psListGetPrevious(mdList);
-        } else {
-            entry = psListGetPrevious(mdList);
-            break;
-        }
-    }
-
-    return entry;
-}
Index: /trunk/psLib/src/types/psMetadata.h
===================================================================
--- /trunk/psLib/src/types/psMetadata.h	(revision 2658)
+++ /trunk/psLib/src/types/psMetadata.h	(revision 2659)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 22:59:05 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 23:27:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -252,41 +252,4 @@
 );
 
-/** Set or reset metadata iterator.
- *
- *  Metadata may be iterated by setting or resetting an iterator to a location
- *  in the metadata list.
- *
- * @return void: void.
- */
-psBool psMetadataSetIterator(
-    psMetadata*  md,           ///< Metadata collection to iterate.
-    psS32 where                ///< Location of iterator.
-);
-
-/** Get next metadata item.
- *
- * Get next metadata item in iterator list.
- *
- * @return psMetadataItem* : Pointer metadata item.
- */
-psMetadataItem* psMetadataGetNext(
-    psMetadata*  md,           ///< Metadata collection to iterate.
-    const char * match,        ///< Beginning of key name.
-    psS32 which                ///< Iterator to be used.
-);
-
-/** Get previous metadata item.
- *
- * Get previous metadata item in iterator list.
- *
- * @return psMetadataItem* : Pointer metadata item.
- */
-psMetadataItem* psMetadataGetPrevious(
-    psMetadata *md,            ///< Metadata collection to iterate.
-    const char *match,         ///< Beginning of key name.
-    psS32 which                ///< Iterator to be used.
-);
-
-
 /// @}