IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5454


Ignore:
Timestamp:
Oct 28, 2005, 2:05:53 PM (21 years ago)
Author:
drobbin
Message:

Made minor changes in accordance with api-delta report from rev 17

Location:
trunk/psLib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/sys/psType.h

    r5136 r5454  
    1010*  @author Ross Harman, MHPCC
    1111*
    12 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-09-26 21:13:25 $
     12*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-10-29 00:05:52 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    105105    PS_DATA_ARRAY,                     ///< psArray
    106106    PS_DATA_BITSET,                    ///< psBitSet
    107     PS_DATA_CELL,                      ///< psCell
    108     PS_DATA_CHIP,                      ///< psChip
    109107    PS_DATA_CUBE,                      ///< psCube
    110108    PS_DATA_FITS,                      ///< psFits
    … …  
    127125    PS_DATA_POLYNOMIAL4D,              ///< psPolynomial4D
    128126    PS_DATA_PROJECTION,                ///< psProjection
    129     PS_DATA_READOUT,                   ///< psReadout
    130     PS_DATA_REGION,                    ///< psRegion
    131127    PS_DATA_SCALAR,                    ///< psScalar
    132128    PS_DATA_SPHERE,                    ///< psSphere

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

    r5216 r5454  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-10-01 02:22:15 $
     13 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-10-29 00:05:53 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    116116 */
    117117void psArrayElementsFree(
    118     psArray* psArr                     ///< Void pointer array to destroy.
     118    psArray* array                     ///< Void pointer array to destroy.
    119119);
    120120

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

    r5203 r5454  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-09-30 01:34:45 $
     14 *  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-10-29 00:05:53 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    248248    case     PS_DATA_ARRAY:                     ///< psArray
    249249    case     PS_DATA_BITSET:                    ///< psBitSet
    250     case     PS_DATA_CELL:                      ///< psCell
    251     case     PS_DATA_CHIP:                      ///< psChip
    252250    case     PS_DATA_CUBE:                      ///< psCube
    253251    case     PS_DATA_FITS:                      ///< psFits
    … …  
    270268    case     PS_DATA_POLYNOMIAL4D:              ///< psPolynomial4D
    271269    case     PS_DATA_PROJECTION:                ///< psProjection
    272     case     PS_DATA_READOUT:                   ///< psReadout
    273     case     PS_DATA_REGION:                    ///< psRegion
    274270    case     PS_DATA_SCALAR:                    ///< psScalar
    275271    case     PS_DATA_SPHERE:                    ///< psSphere
    … …  
    867863
    868864
    869 char *psMetadataLookupStr(bool *status,
    870                           const psMetadata *md,
    871                           const char *key)
     865psString psMetadataLookupStr(bool *status,
     866                             const psMetadata *md,
     867                             const char *key)
    872868{
    873869    psMetadataItem *item = psMetadataLookup((psMetadata*)md, key); // The metadata with instruments
    874     char *value = NULL;   // The value to return
     870    //    char *value = NULL;   // The value to return
     871    psString value = NULL;
    875872    if (!item) {
    876873        // The given key isn't in the metadata
    … …  
    893890            *status = true;
    894891        }
    895         value = item->data.V; // The requested metadata
     892        //        value = item->data.V; // The requested metadata
     893        value = psStringNCopy(item->data.V, strlen(item->data.V) );
    896894    }
    897895    return value;

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

    r5203 r5454  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-09-30 01:34:45 $
     13*  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-10-29 00:05:53 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    490490 *  @return bool:  True for success, False for failure.
    491491 */
    492 psBool psMetadataAddPtr(
     492bool psMetadataAddPtr(
    493493    psMetadata* md,                    ///< Metadata collection to insert metadata item
    494494    long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
    … …  
    711711 *  @return char*:           Value of metadata item.
    712712 */
    713 char *psMetadataLookupStr(
     713psString psMetadataLookupStr(
    714714    bool *status,                      ///< Status of lookup.
    715715    const psMetadata *md,              ///< Metadata collection to lookup metadata item.

  • trunk/psLib/test/types/tst_psMetadata_04.c

    r5136 r5454  
    2525*  @author  Ross Harman, MHPCC
    2626*
    27 *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
    28 *  @date  $Date: 2005-09-26 21:13:33 $
     27*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
     28*  @date  $Date: 2005-10-29 00:05:53 $
    2929*
    3030*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    223223    // Test K - Lookup metadata item and return psString value
    224224    printPositiveTestHeader(stdout, "psMetadata", "Test K - Lookup metadata item and return psString value");
    225     char *newSTR;
     225    psString newSTR;
    226226    newSTR = psMetadataLookupStr(&status, metadata, "myItem8");
    227227    if( strncmp(newSTR, string, 50) ) {
    … …  
    307307    // Test Q - Free psMetadata
    308308    printPositiveTestHeader(stdout, "psMetadata", "Test Q - Free psMetadata");
    309     //    psFree(newSTR);
     309    psFree(newSTR);
    310310    //    psFree(string);
    311311    psFree(newMD);

  • trunk/psLib/test/types/verified/tst_psMetadata_01.stdout

    r5136 r5454  
    4444 Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
    4545 Key Name: XTENSION  Key mdType: 0x00010000  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
    46  Key Name:   BITPIX  Key mdType: 0x00010023  Key Value:                  Key Comment:
     46 Key Name:   BITPIX  Key mdType: 0x0001001f  Key Value:                  Key Comment:
    4747    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    4848    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    4949 Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
    50  Key Name:  HISTORY  Key mdType: 0x00010023  Key Value:                  Key Comment:
     50 Key Name:  HISTORY  Key mdType: 0x0001001f  Key Value:                  Key Comment:
    5151    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    5252    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    … …  
    8181 Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
    8282 Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
    83  Key Name:  HISTORY  Key mdType: 0x00010023  Key Value:                  Key Comment:
     83 Key Name:  HISTORY  Key mdType: 0x0001001f  Key Value:                  Key Comment:
    8484    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
    8585    Key Name:  HISTORY  Key mdType: 0x00010000  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>

  • trunk/psLib/test/types/verified/tst_psMetadata_06.stdout

    r5136 r5454  
    99Key Name:  myItem1  Key mdType: 0x00000104  Key Value:             222  Key Comment: I am a signed integer
    1010Key Name:  myItem2  Key mdType: 0x00000104  Key Value:             333  Key Comment: I am a signed integer
    11 Key Name:  myItem2  Key mdType: 0x0001000b  Key Value:          psList  Key Comment: I am a list
     11Key Name:  myItem2  Key mdType: 0x00010009  Key Value:          psList  Key Comment: I am a list
    1212
    1313---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata and items} | tst_psMetadata_06.c)
Note: See TracChangeset for help on using the changeset viewer.