IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 3, 2004, 1:19:07 PM (22 years ago)
Author:
harman
Message:

Updates for version 10 of SDRS

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2392 r2607  
    1313*  @author  Ross Harman, MHPCC
    1414*
    15 *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
    16 *  @date  $Date: 2004-11-22 20:54:50 $
     15*  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
     16*  @date  $Date: 2004-12-03 23:19:07 $
    1717*
    1818*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2424#include <string.h>
    2525
    26 static void printMetadataItem(psMetadataItem *item)
     26static void printMetadataItem(psMetadataItem *metadataItem)
    2727{
    28     printf("Key Name: %8s  ", item->name);
    29     printf("Key Type: %2d  ", item->type);
     28    printf("Key Name: %8s  ", metadataItem->name);
     29    printf("Key pType: %2d  ", metadataItem->pType);
     30    printf("Key mdType: %2d  ", metadataItem->type);
    3031
    31     switch (item->type ) {
    32     case PS_META_BOOL:
    33         printf("Key Value: %15d  ", item->data.B);
     32    switch (metadataItem->type) {
     33    case PS_META_LIST:
     34        printf("Key Value: %17c", ' ');
    3435        break;
    35     case PS_META_S32:
    36         printf("Key Value: %15d  ", item->data.S32);
    37         break;
    38     case PS_META_F32:
    39         printf("Key Value: %15.3f  ", item->data.F32);
    40         break;
    41     case PS_META_F64:
    42         printf("Key Value: %15.3f  ", item->data.F64);
     36    case PS_META_PRIMITIVE:
     37        switch(metadataItem->pType) {
     38        case PS_TYPE_BOOL:
     39            printf("Key Value: %15d  ", metadataItem->data.B);
     40            break;
     41        case PS_TYPE_S32:
     42            printf("Key Value: %15d  ", metadataItem->data.S32);
     43            break;
     44        case PS_TYPE_F32:
     45            printf("Key Value: %15.3f  ", metadataItem->data.F32);
     46            break;
     47        case PS_TYPE_F64:
     48            printf("Key Value: %15.3f  ", metadataItem->data.F64);
     49            break;
     50        default:
     51            printf("Bad type: %d ", metadataItem->pType);
     52        }
    4353        break;
    4454    case PS_META_STR:
    45         printf("Key Value: %15s  ", (char*)item->data.V);
    46         break;
    47     case PS_META_IMG:
    48     case PS_META_JPEG:
    49     case PS_META_PNG:
    50     case PS_META_ASTROM:
    51     case PS_META_UNKNOWN:
    52         printf("Value: unknown ");
     55        printf("Key Value: %15s  ", (char*)metadataItem->data.V);
    5356        break;
    5457    default:
    55         printf("Bad type: %d ", item->type);
     58        printf("Bad type: %d ", metadataItem->type);
    5659    }
    57     printf("Key Comment: %s\n", item->comment);
     60    printf("Key Comment: %s\n", metadataItem->comment);
    5861}
    5962
    … …  
    7174    // Test A - Allocate metadata and items
    7275    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata and items");
    73     item1a = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
    74     item1b = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 111);
    75     item1c = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 222);
    76     item2a = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 333);
    77     item2b = psMetadataItemAlloc("myItem2", PS_META_ITEM_SET, "I am a folder node", NULL);
     76    item1a = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
     77    item1b = psMetadataItemAlloc("myItem1", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 111);
     78    item1c = psMetadataItemAlloc("myItem1", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 222);
     79    item2a = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 333);
     80    item2b = psMetadataItemAlloc("myItem2", PS_TYPE_PTR, PS_META_LIST, "I am a folder node", NULL);
    7881    metadata = psMetadataAlloc();
    7982    printMetadataItem(item1a);
    … …  
    8790    // Test B - Add leaf node on top of existing leaf node
    8891    printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node");
    89     if( ! psMetadataAddItem(metadata, item1a, PS_LIST_HEAD) ) {
     92    if(!psMetadataAddItem(metadata, item1a, PS_LIST_HEAD)) {
    9093        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top.");
    9194        return 20;
    9295    }
    93     if ( ! psMetadataAddItem(metadata, item1b, PS_LIST_HEAD) ) {
     96    if (!psMetadataAddItem(metadata, item1b, PS_LIST_HEAD)) {
    9497        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top.");
    9598        return 21;
    … …  
    101104    // Test C - Add leaf node to existing folder node
    102105    printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node");
    103     if ( ! psMetadataAddItem(metadata, item1c, PS_LIST_HEAD) ) {
     106    if (!psMetadataAddItem(metadata, item1c, PS_LIST_HEAD)) {
    104107        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem return false for adding a not to existing node.");
    105108        return 22;
    … …  
    110113    // Test D - Add folder node on top of existing leaf node
    111114    printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node");
    112     if ( ! psMetadataAddItem(metadata, item2a, PS_LIST_HEAD) ) {
     115    if (!psMetadataAddItem(metadata, item2a, PS_LIST_HEAD)) {
    113116        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node to existing leaf node.");
    114117        return 23;
    115118    }
    116     if ( ! psMetadataAddItem(metadata, item2b, PS_LIST_HEAD) ) {
     119    if (!psMetadataAddItem(metadata, item2b, PS_LIST_HEAD)) {
    117120        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a nod to existing leaf node.");
    118121        return 24;
Note: See TracChangeset for help on using the changeset viewer.