Changeset 9538 for trunk/psLib/src/types

Timestamp:

Oct 13, 2006, 11:13:48 AM (20 years ago)

Author:

Paul Price

Message:

Synchronising with SDRS, and cleaning up:

• Replaced is_psType() with PS_ASSERT_PTR() throughout psLib.
• Changed "char *" to "psString" where appropriate in psDB and a few other places (to indicate pointers on the PS memory system).
• Removed psLogArguments and psTraceArguments (functionality in psArgumentVerbosity).
• Renamed psMetadataLookupMD to psMetadataLookupMetadata (it was about time...). Similarly with the psPolynomial?D{From,To}MD functions.
• Removed psMetadataRemove() since it is ambiguous about what's removed --- use psMetadataRemove{Key,Index}.
• psArrayRemoveByPos --> psArrayRemoveIndex
• psArrayRemove --> psArrayRemoveData

Location:

trunk/psLib/src/types

Files:

• psArguments.c (modified) (2 diffs)
• psArguments.h (modified) (2 diffs)
• psArray.c (modified) (4 diffs)
• psArray.h (modified) (3 diffs)
• psBitSet.c (modified) (2 diffs)
• psHash.c (modified) (2 diffs)
• psList.c (modified) (3 diffs)
• psLookupTable.c (modified) (2 diffs)
• psMetadata.c (modified) (15 diffs)
• psMetadata.h (modified) (19 diffs)
• psMetadataConfig.c (modified) (2 diffs)
• psPixels.c (modified) (3 diffs)

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-26 02:55:34 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -480 +480 @@
 }
 
-// we have log levels 1 (Error), 2 (Warning), 3 (Info), 4 (Details), 5 (Minutiae)
-// 2 = default, -v = 3, -vv = 4, -vvv = 5
-psS32 psLogArguments (int *argc,
-                      char **argv)
-{
-    int N, level;
-
-    // default log level is 2
-    level = 2;
-
-    psLogSetLevel (level);
-    PS_ASSERT_PTR_NON_NULL(argv, 2);
-    PS_ASSERT_PTR_NON_NULL(argc, 2);
-    // set in order, so that -vvv overrides -vv overrides -v
-    if ((N = psArgumentGet (*argc, argv, "-v"))) {
-        psArgumentRemove (N, argc, argv);
-        level = 3;
-    }
-    if ((N = psArgumentGet (*argc, argv, "-vv"))) {
-        psArgumentRemove (N, argc, argv);
-        level = 4;
-    }
-    if ((N = psArgumentGet (*argc, argv, "-vvv"))) {
-        psArgumentRemove (N, argc, argv);
-        level = 5;
-    }
-
-    if ((N = psArgumentGet (*argc, argv, "-logfmt"))) {
-        if (*argc < N + 2) {
-            //            psAbort ("psLogArguments", "USAGE: -logfmt (format)");
-            psError(PS_ERR_IO, true, "-logfmt switch specified without a format.");
-        } else {
-            psArgumentRemove (N, argc, argv);
-            psLogSetFormat (argv[N]); // XXX EAM : this function should return an error if the log format is invalid
-            psArgumentRemove (N, argc, argv);
-        }
-    }
-
-    // set the level, return the level
-    psLogSetLevel (level);
-    return (level);
-}
-
-// set trace levels by facility
-psS32 psTraceArguments (int *argc,
-                        char **argv)
-{
-    int N;
-    PS_ASSERT_PTR_NON_NULL(argv, 0);
-    PS_ASSERT_PTR_NON_NULL(argc, 0);
-
-    // argument format is: -trace (facil) (level)
-    while ((N = psArgumentGet (*argc, argv, "-trace"))) {
-        if (*argc < N + 3) {
-            //            psAbort ("psTraceArguments", "USAGE: -trace (facility) (level)");
-            psError(PS_ERR_IO, true, "-trace switch specified without facility and level.");
-            return 0;
-        }
-        psArgumentRemove (N, argc, argv);
-        psTraceSetLevel (argv[N], atoi(argv[N+1]));
-        psArgumentRemove (N, argc, argv);
-        psArgumentRemove (N, argc, argv);
-    }
-    if ((N = psArgumentGet (*argc, argv, "-trace-levels"))) {
-        psTracePrintLevels ();
-        //        exit (2);
-        return 0;
-    }
-    return (TRUE);
-}
-

trunk/psLib/src/types/psArguments.h

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-25 03:02:47 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
 );
 
-/** Sets the log level.
- *
- *  @return psS32:     the log level.
- */
-psS32 psLogArguments(
-    int *argc,                         ///< number of arguments
-    char **argv                        ///< the argument list
-);
-
-/** Sets trace levels by facility
- *
- *  @return psS32:      1 (true) if successful or else 2.
- */
-psS32 psTraceArguments(
-    int *argc,                         ///< number of arguments
-    char **argv                        ///< the argument list
-);
-
 
 /// @}

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-26 02:55:34 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -45 +45 @@
 bool psMemCheckArray(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)arrayFree );
 }
@@ -133 +131 @@
 }
 
-bool psArrayRemove(psArray* array,
-                   const psPtr data)
+bool psArrayRemoveData(psArray* array,
+                       const psPtr data)
 {
     bool success = false;
@@ -159 +157 @@
 }
 
-bool psArrayRemoveByPos(psArray* array,
-                        long position)
+bool psArrayRemoveByIndex(psArray* array,
+                          long index)
 {
     PS_ASSERT_PTR_NON_NULL(array, false);
 
-    if (position < 0 || position >= array->n) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                _("position > then the number of elements in the array."));
-        return false;
-    }
-
-    long i = position;
+    if (index < 0 || index >= array->n) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                _("index > then the number of elements in the array."));
+        return false;
+    }
+
+    long i = index;
     long n = array->n;
     psFree(array->data[i]);

trunk/psLib/src/types/psArray.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-05 22:32:29 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -105 +105 @@
  *
  */
-bool psArrayRemove(
+bool psArrayRemoveData(
     psArray* array,                    ///< array to operate on
     const psPtr data                   ///< the data pointer to remove from psArray
@@ -118 +118 @@
  *
  */
-bool psArrayRemoveByPos(
+bool psArrayRemoveByIndex(
     psArray* array,                    ///< array to operate on
-    long position                      ///< the element to remove
+    long index                      ///< the element to remove
 );
 

trunk/psLib/src/types/psBitSet.c

@@ -11 +11 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-01 00:40:35 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -66 +66 @@
 bool psMemCheckBitSet(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)bitSetFree );
 }

trunk/psLib/src/types/psHash.c

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-01 00:45:34 $
+*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-13 21:13:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
 bool psMemCheckHash(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)hashFree );
 }

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-03 06:51:47 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include "psTrace.h"
 #include "psLogMsg.h"
-
+#include "psAssert.h"
 
 
@@ -140 +140 @@
 bool psMemCheckList(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)listFree );
 }

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-03 06:51:47 $
+*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-13 21:13:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -264 +264 @@
 bool psMemCheckLookupTable(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)lookupTableFree );
 }

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.138 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 19:06:00 $
+ *  @version $Revision: 1.139 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -157 +157 @@
 bool psMemCheckMetadataItem(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)metadataItemFree );
 }
@@ -340 +338 @@
 bool psMemCheckMetadata(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)metadataFree );
 }
@@ -567 +563 @@
 
             // remove the existing entry from metadata
-            psMetadataRemove(md,0,key);
+            psMetadataRemoveKey(md, key);
 
             // treat as if new (added to list below)
@@ -662 +658 @@
 
 #define METADATA_ADD_TYPE(NAME,TYPE,METATYPE) \
-psBool psMetadataAdd##NAME(psMetadata* md, long where, const char* name, \
-                           int format, const char* comment, TYPE value) { \
-    return psMetadataAdd(md,where,name, format | METATYPE,comment,value); \
+bool psMetadataAdd##NAME(psMetadata* md, long where, const char* name, \
+                         int format, const char* comment, TYPE value) { \
+    return psMetadataAdd(md, where, name, format | METATYPE, comment, value); \
 }
 
@@ -679 +675 @@
 METADATA_ADD_TYPE(F64,psF64,PS_DATA_F64)
 METADATA_ADD_TYPE(List,psList*,PS_DATA_LIST)
-//METADATA_ADD_TYPE(Str,const char*,PS_DATA_STRING)
+METADATA_ADD_TYPE(Str,const char*,PS_DATA_STRING)
 METADATA_ADD_TYPE(Vector,psVector*,PS_DATA_VECTOR)
 METADATA_ADD_TYPE(Image,psImage*,PS_DATA_IMAGE)
 METADATA_ADD_TYPE(Hash,psHash*,PS_DATA_HASH)
 METADATA_ADD_TYPE(LookupTable,psLookupTable*,PS_DATA_LOOKUPTABLE)
-METADATA_ADD_TYPE(Unknown,void*,PS_DATA_UNKNOWN)
 METADATA_ADD_TYPE(Metadata,psMetadata*,PS_DATA_METADATA)
 METADATA_ADD_TYPE(Array,psArray*,PS_DATA_ARRAY)
 METADATA_ADD_TYPE(Time,psTime*,PS_DATA_TIME)
-
-bool psMetadataAddPtr(psMetadata *md,
-                      long location,
-                      const char *name,
-                      psDataType type,
-                      const char *comment,
-                      psPtr value)
-{
-    PS_ASSERT_PTR_NON_NULL(md,false);
-    PS_ASSERT_PTR_NON_NULL(md->list,false);
-    PS_ASSERT_PTR_NON_NULL(value,false);
-    return (psMetadataAdd(md, location, name, type, comment, value) );
-
-}
-
-bool psMetadataAddStr(psMetadata *md,
-                      long location,
-                      const char *name,
-                      int format,
-                      const char *comment,
-                      const char* value)
-{
-    PS_ASSERT_PTR_NON_NULL(md,false);
-    PS_ASSERT_PTR_NON_NULL(md->list,false);
-
-    return (psMetadataAdd(md, location, name, format | PS_DATA_STRING, comment, value) );
-}
-
-bool psMetadataRemove(psMetadata *md,
-                      long where,
-                      const char *key)
-{
-    PS_ASSERT_PTR_NON_NULL(md,NULL);
-
-    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
-    psList* mdList = md->list;
-
-    PS_ASSERT_PTR_NON_NULL(md->hash,NULL);
-    psHash* mdTable = md->hash;
-
-    // Select removal by key or index
-    if (key != NULL) {
-        // Remove by key name
-        psMetadataItem* entry = psHashLookup(mdTable,key);
-        if (entry == NULL) {
-            psError(PS_ERR_UNKNOWN, false,
-                    _("Failed to remove metadata item, %s, from metadata table."), key);
-            return false;
-        }
-        if (entry->type == PS_DATA_METADATA_MULTI) {
-            psMetadataItem* listItem;
-            psListIterator* iter = psListIteratorAlloc(
-                                       entry->data.list,
-                                       PS_LIST_HEAD,true);
-            while ((listItem=psListGetAndIncrement(iter)) != NULL) {
-                psListRemoveData(mdList, listItem);
-            }
-            psFree(iter);
-            psHashRemove(mdTable,key);
-
-        } else {
-            psListRemoveData(mdList, entry);
-            psHashRemove(mdTable, key);
-        }
-    } else {
-        // Remove by index
-        psMetadataItem* entry = psListGet(mdList, where);
-        if (entry == NULL) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("Could not find metadata item at index %ld."), where);
-            return false;
-        }
-        key = entry->name;
-
-        if (key == NULL) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("Failed to remove metadata item, at index %ld, from metadata list."),
-                    where);
-            return false;
-        }
-
-        psMetadataItem* tableItem = psHashLookup(mdTable, key);
-        if (tableItem == NULL) {
-            psError(PS_ERR_UNKNOWN, false,
-                    _("Failed to remove metadata item, %s, from metadata table."), key);
-            return false;
-        }
-
-        if (tableItem->type == PS_DATA_METADATA_MULTI) {
-            // multiple entries with same key, remove just the specified one
-            psListRemoveData(tableItem->data.list, entry);
-        } else {
-            //Tested below.  psHashRemove can't return false here.
-            psHashRemove(mdTable, key);
-        }
-        psListRemove(mdList, where);
-    }
-
-    return true;
-}
-
+METADATA_ADD_TYPE(Unknown,psPtr,PS_DATA_UNKNOWN)
+
+bool psMetadataAddPtr(psMetadata* md, long where, const char* name,
+                      psDataType type, const char* comment, psPtr value)
+{
+    return psMetadataAdd(md, where, name, type, comment, value);
+}
+
+
+
+// Remove by key name
 bool psMetadataRemoveKey(psMetadata *md,
                          const char *key)
 {
-    return ( psMetadataRemove(md, PS_LIST_HEAD, key) );
-}
-
+    PS_ASSERT_PTR_NON_NULL(md, false);
+
+    PS_ASSERT_PTR_NON_NULL(md->list, false);
+    psList* mdList = md->list;
+
+    PS_ASSERT_PTR_NON_NULL(md->hash,false);
+    psHash* mdTable = md->hash;
+
+    PS_ASSERT_PTR_NON_NULL(key, false);
+    PS_ASSERT_INT_POSITIVE(strlen(key), false);
+
+    psMetadataItem* entry = psHashLookup(mdTable,key);
+    if (entry == NULL) {
+        psError(PS_ERR_UNKNOWN, false,
+                _("Failed to remove metadata item, %s, from metadata table."), key);
+        return false;
+    }
+    if (entry->type == PS_DATA_METADATA_MULTI) {
+        psMetadataItem* listItem;
+        psListIterator* iter = psListIteratorAlloc(
+                                   entry->data.list,
+                                   PS_LIST_HEAD,true);
+        while ((listItem=psListGetAndIncrement(iter)) != NULL) {
+            psListRemoveData(mdList, listItem);
+        }
+        psFree(iter);
+        psHashRemove(mdTable,key);
+    } else {
+        psListRemoveData(mdList, entry);
+        psHashRemove(mdTable, key);
+    }
+
+    return true;
+}
+
+
+// Remove by index
 bool psMetadataRemoveIndex(psMetadata *md,
-                           int location)
-{
-    return ( psMetadataRemove(md, location, NULL) );
+                           long location)
+{
+    PS_ASSERT_PTR_NON_NULL(md, false);
+
+    PS_ASSERT_PTR_NON_NULL(md->list, false);
+    psList* mdList = md->list;
+
+    PS_ASSERT_PTR_NON_NULL(md->hash,false);
+    psHash* mdTable = md->hash;
+
+    psMetadataItem* entry = psListGet(mdList, location);
+    if (entry == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                _("Could not find metadata item at index %ld."), location);
+        return false;
+    }
+    const char *key = entry->name;
+
+    if (key == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                _("Failed to remove metadata item, at index %ld, from metadata list."),
+                location);
+        return false;
+    }
+
+    psMetadataItem* tableItem = psHashLookup(mdTable, key);
+    if (tableItem == NULL) {
+        psError(PS_ERR_UNKNOWN, false,
+                _("Failed to remove metadata item, %s, from metadata table."), key);
+        return false;
+    }
+
+    if (tableItem->type == PS_DATA_METADATA_MULTI) {
+        // multiple entries with same key, remove just the specified one
+        psListRemoveData(tableItem->data.list, entry);
+    } else {
+        //Tested below.  psHashRemove can't return false here.
+        psHashRemove(mdTable, key);
+    }
+    psListRemove(mdList, location);
+
+    return true;
 }
 
@@ -1095 +1073 @@
 }
 
-psMetadata *psMetadataLookupMD(bool *status,
-                               const psMetadata *md,
-                               const char *key)
+psMetadata *psMetadataLookupMetadata(bool *status,
+                                     const psMetadata *md,
+                                     const char *key)
 {
     PS_ASSERT_PTR_NON_NULL(md,NULL);
@@ -1413 +1391 @@
 }
 
-psPolynomial1D *psPolynomial1DfromMD (psMetadata *folder)
+psPolynomial1D *psPolynomial1DfromMetadata(const psMetadata *folder)
 {
     PS_ASSERT_PTR_NON_NULL(folder, NULL);
@@ -1462 +1440 @@
 
 // XXX : these may need F64, or %g format for output
-bool psPolynomial1DtoMD (psMetadata *md,
-                         psPolynomial1D *poly,
-                         char *format,
-                         ...)
+bool psPolynomial1DtoMetadata(psMetadata *md,
+                              const psPolynomial1D *poly,
+                              const char *format,
+                              ...)
 {
     PS_ASSERT_PTR_NON_NULL(md, false);
@@ -1519 +1497 @@
 }
 
-psPolynomial2D *psPolynomial2DfromMD (psMetadata *folder)
+psPolynomial2D *psPolynomial2DfromMetadata(const psMetadata *folder)
 {
     PS_ASSERT_PTR_NON_NULL(folder, NULL);
@@ -1575 +1553 @@
 
 // XXX : these may need F64, or %g format for output
-bool psPolynomial2DtoMD (psMetadata *md,
-                         psPolynomial2D *poly,
-                         char *format,
-                         ...)
+bool psPolynomial2DtoMetadata (psMetadata *md,
+                               const psPolynomial2D *poly,
+                               const char *format,
+                               ...)
 {
     PS_ASSERT_PTR_NON_NULL(md, false);
@@ -1642 +1620 @@
 }
 
-psPolynomial3D *psPolynomial3DfromMD (psMetadata *folder)
+psPolynomial3D *psPolynomial3DfromMetadata (const psMetadata *folder)
 {
     PS_ASSERT_PTR_NON_NULL(folder, NULL);
@@ -1705 +1683 @@
 }
 
-bool psPolynomial3DtoMD (psMetadata *md,
-                         psPolynomial3D *poly,
-                         char *format,
-                         ...)
+bool psPolynomial3DtoMetadata (psMetadata *md,
+                               const psPolynomial3D *poly,
+                               const char *format,
+                               ...)
 {
     PS_ASSERT_PTR_NON_NULL(md, false);
@@ -1770 +1748 @@
 }
 
-psPolynomial4D *psPolynomial4DfromMD (psMetadata *folder)
+psPolynomial4D *psPolynomial4DfromMetadata(const psMetadata *folder)
 {
     PS_ASSERT_PTR_NON_NULL(folder, NULL);
@@ -1839 +1817 @@
 }
 
-bool psPolynomial4DtoMD (psMetadata *md,
-                         psPolynomial4D *poly,
-                         char *format,
-                         ...)
+bool psPolynomial4DtoMetadata (psMetadata *md,
+                               const psPolynomial4D *poly,
+                               const char *format,
+                               ...)
 {
     PS_ASSERT_PTR_NON_NULL(md, false);

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-13 19:06:00 $
+*  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-13 21:13:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -598 +598 @@
 /** Add a psList to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddList(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddList(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -624 +624 @@
 /** Add a vector to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddVector(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddVector(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -637 +637 @@
 /** Add a array to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddArray(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddArray(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -650 +650 @@
 /** Add an Image to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddImage(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddImage(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -663 +663 @@
 /** Add a Time to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddTime(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddTime(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -676 +676 @@
 /** Add a Hash to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddHash(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddHash(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -689 +689 @@
 /** Add a LookupTable to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddLookupTable(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddLookupTable(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -702 +702 @@
 /** Add an Unknown (psPtr) to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddUnknown(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddUnknown(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -728 +728 @@
 /** Add Metadata to metadata collection.
  *
- *  @return psBool:  True for success, False for failure.
- */
-psBool psMetadataAddMetadata(
+ *  @return bool:  True for success, False for failure.
+ */
+bool psMetadataAddMetadata(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -737 +737 @@
     const char* comment,               ///< Comment for metadata item
     psMetadata* value                  ///< Metadata for metadata item data
-);
-
-/** Remove an item from metadata collection.
- *
- *  Items may be removed from metadata by specifing a key or location. If the
- *  name is null, the where argument is used instead. If name is not null,
- *  where is set to PS_LIST_UNKNOWN. If the item is found, it is removed from
- *  the metadata and true is returned.  If the key is not unique, then all
- *  items corresponding to it are removed.
- *
- * @return bool: True for success, false for failure.
- */
-bool psMetadataRemove(
-    psMetadata*  md,                   ///< Metadata collection to remove metadata item.
-    long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
-    const char * key                   ///< Name of metadata key.
 );
 
@@ -770 +754 @@
 bool psMetadataRemoveIndex(
     psMetadata *md,                    ///< Metadata collection to remove metadata item.
-    int location                       ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    long location                       ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
 );
 
@@ -1021 +1005 @@
  *  @return psMetadata*:        Value of metadata item.
  */
-psMetadata *psMetadataLookupMD(
+psMetadata *psMetadataLookupMetadata(
     bool *status,                      ///< Status of lookup.
     const psMetadata *md,              ///< Metadata collection to lookup metadata item.
@@ -1113 +1097 @@
  *  @return psPolynomial2D*:        Newly allocated psPolynomial2D from metadata.
  */
-psPolynomial2D *psPolynomial2DfromMD(
-    psMetadata *folder                 ///< folder containing the polynomial info.
+psPolynomial2D *psPolynomial2DfromMetadata(
+    const psMetadata *folder                 ///< folder containing the polynomial info.
 );
 
@@ -1129 +1113 @@
  *  @return bool:       True if successful, otherwise false.
  */
-bool psPolynomial2DtoMD(
+bool psPolynomial2DtoMetadata(
     psMetadata *md,                    ///< Metadata container for polynomial storage.
-    psPolynomial2D *poly,              ///< Polynomial information to be stored.
-    char *format,                      ///< Name of polynomial folder.
+    const psPolynomial2D *poly,              ///< Polynomial information to be stored.
+    const char *format,                      ///< Name of polynomial folder.
     ...                                ///< Arguments for name formatting.
 );
@@ -1147 +1131 @@
  *  @return psPolynomial3D*:        Newly allocated psPolynomial3D from metadata.
  */
-psPolynomial3D *psPolynomial3DfromMD(
-    psMetadata *folder                 ///< folder containing the polynomial info.
+psPolynomial3D *psPolynomial3DfromMetadata(
+    const psMetadata *folder                 ///< folder containing the polynomial info.
 );
 
@@ -1163 +1147 @@
  *  @return bool:       True if successful, otherwise false.
  */
-bool psPolynomial3DtoMD(
+bool psPolynomial3DtoMetadata(
     psMetadata *md,                    ///< Metadata container for polynomial storage.
-    psPolynomial3D *poly,              ///< Polynomial information to be stored.
-    char *format,                      ///< Name of polynomial folder.
+    const psPolynomial3D *poly,              ///< Polynomial information to be stored.
+    const char *format,                      ///< Name of polynomial folder.
     ...                                ///< Arguments for name formatting.
 );
@@ -1181 +1165 @@
  *  @return psPolynomial4D*:        Newly allocated psPolynomial4D from metadata.
  */
-psPolynomial4D *psPolynomial4DfromMD(
-    psMetadata *folder                 ///< folder containing the polynomial info.
+psPolynomial4D *psPolynomial4DfromMetadata(
+    const psMetadata *folder                 ///< folder containing the polynomial info.
 );
 
@@ -1197 +1181 @@
  *  @return bool:       True if successful, otherwise false.
  */
-bool psPolynomial4DtoMD(
+bool psPolynomial4DtoMetadata(
     psMetadata *md,                    ///< Metadata container for polynomial storage.
-    psPolynomial4D *poly,              ///< Polynomial information to be stored.
-    char *format,                      ///< Name of polynomial folder.
+    const psPolynomial4D *poly,              ///< Polynomial information to be stored.
+    const char *format,                      ///< Name of polynomial folder.
     ...                                ///< Arguments for name formatting.
 );

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-09-26 02:55:34 $
+*  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-13 21:13:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1118 +1118 @@
                 } else {
                     // Remove lower info level
-                    if(!psArrayRemoveByPos(levelArray, *level)) {
+                    if(!psArrayRemoveByIndex(levelArray, *level)) {
                         psFree(keyName);
                         return false;

trunk/psLib/src/types/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-26 02:55:34 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 #include "psPixels.h"
 #include "psMemory.h"
-
+#include "psAssert.h"
 #include "psError.h"
 
@@ -74 +74 @@
 bool psMemCheckPixels(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)pixelsFree );
 }