IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 11, 2005, 10:38:56 AM (21 years ago)
Author:
desonia
Message:

made adjustments to psMetadata and added psFitsUpdateTable.

Location:
trunk/psLib/test/collections
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/collections/tst_psMetadataIO.c

    r3381 r3407  
    1414 *  @author  Robert DeSonia, MHPCC
    1515 *
    16  *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
    17  *  @date  $Date: 2005-03-07 20:58:50 $
     16 *  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
     17 *  @date  $Date: 2005-03-11 20:38:56 $
    1818 *
    1919 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6666static void printMetadataItem(psMetadataItem *metadataItem, char *spaces)
    6767{
     68    char* vecStr;
     69
    6870    printf("%sKey Name: %8s  ", spaces, metadataItem->name);
    69     printf("Key mdType: %d ", metadataItem->type);
     71    printf("Key mdType: 0x%08x ", metadataItem->type);
    7072
    7173    switch (metadataItem->type) {
    … …  
    8587        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    8688        break;
     89    case PS_META_VEC:
     90        vecStr = (char*)psVectorToString((psVector*)metadataItem->data.V, 15);
     91        printf("Key Value: %15s  ", vecStr);
     92        psFree(vecStr);
     93        break;
    8794    case PS_META_STR:
    8895        printf("Key Value: %15s  ", (char*)metadataItem->data.V);
    8996        break;
    9097    default:
    91         printf("Bad type: %d ", metadataItem->type);
     98        printf("Bad type: 0x%08x ", metadataItem->type);
    9299    }
    93100    printf("Key Comment: %s\n", metadataItem->comment);

  • trunk/psLib/test/collections/tst_psMetadata_01.c

    r3381 r3407  
    1818*  @author  Ross Harman, MHPCC
    1919*
    20 *  @version $Revision: 1.22 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2005-03-07 20:58:50 $
     20*  @version $Revision: 1.23 $  $Name: not supported by cvs2svn $
     21*  @date  $Date: 2005-03-11 20:38:56 $
    2222*
    2323*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7272{
    7373    printf("%sKey Name: %8s  ", spaces, metadataItem->name);
    74     printf("Key mdType: %d  ", metadataItem->type);
     74    printf("Key mdType: 0x%08x  ", metadataItem->type);
    7575
    7676    switch (metadataItem->type) {
    … …  
    126126    printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
    127127
     128    printf("ID=%d\n",(int)psMemGetId());
    128129
    129130    // Test B - Read 2nd hdr from complex FITS file
    … …  
    173174    printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
    174175
     176    printf("ID=%d\n",(int)psMemGetId());
    175177
    176178    // Test C - Read named hdr from complex FITS file

  • trunk/psLib/test/collections/tst_psMetadata_02.c

    r3381 r3407  
    1515 *  @author  Robert DeSonia, MHPCC
    1616 *
    17  *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
    18  *  @date  $Date: 2005-03-07 20:58:50 $
     17 *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
     18 *  @date  $Date: 2005-03-11 20:38:56 $
    1919 *
    2020 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929{
    3030    printf("Key Name: %8s  ", metadataItem->name);
    31     printf("Key mdType: %2d  ", metadataItem->type);
     31    printf("Key mdType: 0x%08x  ", metadataItem->type);
    3232
    3333    switch (metadataItem->type) {
    … …  
    9898    printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type",
    9999                            "Invalid psMetadataType: 6", 0);
    100     badItem = psMetadataItemAlloc("badItem", PS_META_NTYPE, "I am bad", "Bad comment");
     100    badItem = psMetadataItemAlloc("badItem", -1, "I am bad", "Bad comment");
    101101    printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true);
    102102

  • trunk/psLib/test/collections/tst_psMetadata_03.c

    r3381 r3407  
    1818*  @author  Ross Harman, MHPCC
    1919*
    20 *  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2005-03-07 20:58:50 $
     20*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
     21*  @date  $Date: 2005-03-11 20:38:56 $
    2222*
    2323*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3232{
    3333    printf("Key Name: %8s  ", metadataItem->name);
    34     printf("Key mdType: %2d  ", metadataItem->type);
     34    printf("Key mdType: 0x%08x  ", metadataItem->type);
    3535
    3636    switch (metadataItem->type) {

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

    r3381 r3407  
    2323*  @author  Ross Harman, MHPCC
    2424*
    25 *  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
    26 *  @date  $Date: 2005-03-07 20:58:50 $
     25*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
     26*  @date  $Date: 2005-03-11 20:38:56 $
    2727*
    2828*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3737{
    3838    printf("Key Name: %8s  ", metadataItem->name);
    39     printf("Key mdType: %2d  ", metadataItem->type);
     39    printf("Key mdType: 0x%08x  ", metadataItem->type);
    4040
    4141    switch (metadataItem->type) {

  • trunk/psLib/test/collections/tst_psMetadata_05.c

    r3381 r3407  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.21 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2005-03-07 20:58:50 $
     24*  @version $Revision: 1.22 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2005-03-11 20:38:56 $
    2626*
    2727*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636{
    3737    printf("Key Name: %8s  ", metadataItem->name);
    38     printf("Key mdType: %2d  ", metadataItem->type);
     38    printf("Key mdType: 0x%08x  ", metadataItem->type);
    3939
    4040    switch (metadataItem->type) {

  • trunk/psLib/test/collections/tst_psMetadata_06.c

    r3381 r3407  
    1313*  @author  Ross Harman, MHPCC
    1414*
    15 *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
    16 *  @date  $Date: 2005-03-07 20:58:50 $
     15*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
     16*  @date  $Date: 2005-03-11 20:38:56 $
    1717*
    1818*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727{
    2828    printf("Key Name: %8s  ", metadataItem->name);
    29     printf("Key mdType: %2d  ", metadataItem->type);
     29    printf("Key mdType: 0x%08x  ", metadataItem->type);
    3030
    3131    switch (metadataItem->type) {
Note: See TracChangeset for help on using the changeset viewer.