IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4370


Ignore:
Timestamp:
Jun 23, 2005, 3:44:18 PM (21 years ago)
Author:
evanalst
Message:

Update metadata collection to handle arrays.

Location:
trunk/psLib/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/collections/psMetadata.c

    r4321 r4370  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-06-20 22:42:29 $
     14*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2005-06-24 01:44:18 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    234234    case PS_META_META:
    235235    case PS_META_MULTI:
     236    case PS_META_ARRAY:
    236237        // Copy of input data not performed due to variability of data types
    237238        metadataItem->data.V = psMemIncrRefCounter(va_arg(argPtr, psPtr));
    … …  
    406407METADATA_ADD_TYPE(Unknown,void*,PS_META_UNKNOWN)
    407408METADATA_ADD_TYPE(Metadata,psMetadata*,PS_META_META)
     409METADATA_ADD_TYPE(Array,psArray*,PS_META_ARRAY)
    408410
    409411psBool psMetadataRemove(psMetadata *md, psS32 where, const char *key)

  • trunk/psLib/src/collections/psMetadata.h

    r4330 r4370  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-06-21 03:01:37 $
     13*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-06-24 01:44:18 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5252    PS_META_UNKNOWN,                   ///< Other data (Stored as item.data.V).
    5353    PS_META_MULTI,                     ///< Used internally, do not create an metadata item of this type.
    54     PS_META_META                       ///< Metadata data (Stored as item.data.md).
     54    PS_META_META,                      ///< Metadata data (Stored as item.data.md).
     55    PS_META_ARRAY                      ///< Array data (Stored as item.data.V).
    5556} psMetadataType;
    5657
    … …  
    368369);
    369370
     371/** Add a array to metadata collection.
     372 * 
     373 *  @return psBool:  True for success, False for failure.
     374 */
     375psBool psMetadataAddArray(
     376    psMetadata* md,                    ///< Metadata collection to insert metadata item
     377    psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     378    const char* name,                  ///< Name of metadata item
     379    const char* comment,               ///< Comment for metadata item
     380    psArray* value                     ///< Vector for metadata item data
     381);
     382
    370383/** Add an Image to metadata collection.
    371384 * 

  • trunk/psLib/src/types/psMetadata.c

    r4321 r4370  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-06-20 22:42:29 $
     14*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2005-06-24 01:44:18 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    234234    case PS_META_META:
    235235    case PS_META_MULTI:
     236    case PS_META_ARRAY:
    236237        // Copy of input data not performed due to variability of data types
    237238        metadataItem->data.V = psMemIncrRefCounter(va_arg(argPtr, psPtr));
    … …  
    406407METADATA_ADD_TYPE(Unknown,void*,PS_META_UNKNOWN)
    407408METADATA_ADD_TYPE(Metadata,psMetadata*,PS_META_META)
     409METADATA_ADD_TYPE(Array,psArray*,PS_META_ARRAY)
    408410
    409411psBool psMetadataRemove(psMetadata *md, psS32 where, const char *key)

  • trunk/psLib/src/types/psMetadata.h

    r4330 r4370  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-06-21 03:01:37 $
     13*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-06-24 01:44:18 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5252    PS_META_UNKNOWN,                   ///< Other data (Stored as item.data.V).
    5353    PS_META_MULTI,                     ///< Used internally, do not create an metadata item of this type.
    54     PS_META_META                       ///< Metadata data (Stored as item.data.md).
     54    PS_META_META,                      ///< Metadata data (Stored as item.data.md).
     55    PS_META_ARRAY                      ///< Array data (Stored as item.data.V).
    5556} psMetadataType;
    5657
    … …  
    368369);
    369370
     371/** Add a array to metadata collection.
     372 * 
     373 *  @return psBool:  True for success, False for failure.
     374 */
     375psBool psMetadataAddArray(
     376    psMetadata* md,                    ///< Metadata collection to insert metadata item
     377    psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     378    const char* name,                  ///< Name of metadata item
     379    const char* comment,               ///< Comment for metadata item
     380    psArray* value                     ///< Vector for metadata item data
     381);
     382
    370383/** Add an Image to metadata collection.
    371384 * 
Note: See TracChangeset for help on using the changeset viewer.