IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 28, 2005, 1:34:10 PM (21 years ago)
Author:
desonia
Message:

Changes to psMetadata to match latest SDRS.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r3264 r3341  
    1818*  @author  Ross Harman, MHPCC
    1919*
    20 *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2005-02-17 19:26:24 $
     20*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
     21*  @date  $Date: 2005-02-28 23:34:10 $
    2222*
    2323*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3232{
    3333    printf("Key Name: %8s  ", metadataItem->name);
    34     printf("Key pType: %2d  ", metadataItem->pType);
    3534    printf("Key mdType: %2d  ", metadataItem->type);
    3635
    … …  
    3938        printf("Key Value: %17c", ' ');
    4039        break;
    41     case PS_META_PRIMITIVE:
    42         switch(metadataItem->pType) {
    43         case PS_TYPE_BOOL:
    44             printf("Key Value: %15d  ", metadataItem->data.B);
    45             break;
    46         case PS_TYPE_S32:
    47             printf("Key Value: %15d  ", metadataItem->data.S32);
    48             break;
    49         case PS_TYPE_F32:
    50             printf("Key Value: %15.3f  ", metadataItem->data.F32);
    51             break;
    52         case PS_TYPE_F64:
    53             printf("Key Value: %15.3f  ", metadataItem->data.F64);
    54             break;
    55         default:
    56             printf("Bad type: %d ", metadataItem->pType);
    57         }
     40    case PS_META_BOOL:
     41        printf("Key Value: %15d  ", metadataItem->data.B);
     42        break;
     43    case PS_META_S32:
     44        printf("Key Value: %15d  ", metadataItem->data.S32);
     45        break;
     46    case PS_META_F32:
     47        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     48        break;
     49    case PS_META_F64:
     50        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    5851        break;
    5952    case PS_META_STR:
    … …  
    8376    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
    8477    metadata = psMetadataAlloc();
    85     item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
    86     item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 55);
    87     item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
    88     item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
    89     errItem = psMetadataItemAlloc("errItem", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 99);
     78    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
     79    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
     80    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
     81    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
     82    errItem = psMetadataItemAlloc("errItem", PS_META_S32, "I am a integer", 99);
    9083    printMetadataItem(item1);
    9184    printMetadataItem(item2);
    … …  
    10194        return 10;
    10295    }
    103     if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am S32 integer",77)) {
     96    if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_META_S32, "I am S32 integer",77)) {
    10497        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
    10598        return 11;
    … …  
    122115        return 14;
    123116    }
    124     if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am S32 integer",88) ) {
     117    if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_META_S32, "I am S32 integer",88) ) {
    125118        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
    126119        return 15;
    … …  
    217210    mdTable = errMetadata->table;
    218211    errMetadata->table = NULL;
    219     if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_TYPE_S32, PS_META_PRIMITIVE, "Integer",22) ) {
     212    if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32, "Integer",22) ) {
    220213        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    221214        return 24;
Note: See TracChangeset for help on using the changeset viewer.