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.

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

Legend:

Unmodified
Added
Removed

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

    r3264 r3341  
    1313*  @author  Ross Harman, MHPCC
    1414*
    15 *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
    16 *  @date  $Date: 2005-02-17 19:26:24 $
     15*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
     16*  @date  $Date: 2005-02-28 23:34:10 $
    1717*
    1818*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6666{
    6767    printf("%sKey Name: %8s  ", spaces, metadataItem->name);
    68     printf("Key pType: %d  ", metadataItem->pType);
    6968    printf("Key mdType: %d  ", metadataItem->type);
    7069
    … …  
    7372        printf("Key Value: %17c", ' ');
    7473        break;
    75     case PS_META_PRIMITIVE:
    76         switch(metadataItem->pType) {
    77         case PS_TYPE_BOOL:
    78             printf("Key Value: %15d  ", metadataItem->data.B);
    79             break;
    80         case PS_TYPE_S32:
    81             printf("Key Value: %15d  ", metadataItem->data.S32);
    82             break;
    83         case PS_TYPE_F32:
    84             printf("Key Value: %15.3f  ", metadataItem->data.F32);
    85             break;
    86         case PS_TYPE_F64:
    87             printf("Key Value: %15.3f  ", metadataItem->data.F64);
    88             break;
    89         default:
    90             printf("Bad type: %d ", metadataItem->pType);
    91         }
     74    case PS_META_BOOL:
     75        printf("Key Value: %15d  ", metadataItem->data.B);
     76        break;
     77    case PS_META_S32:
     78        printf("Key Value: %15d  ", metadataItem->data.S32);
     79        break;
     80    case PS_META_F32:
     81        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     82        break;
     83    case PS_META_F64:
     84        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    9285        break;
    9386    case PS_META_STR:

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

    r3264 r3341  
    1818*  @author  Ross Harman, MHPCC
    1919*
    20 *  @version $Revision: 1.20 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2005-02-17 19:26:24 $
     20*  @version $Revision: 1.21 $  $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
    … …  
    7272{
    7373    printf("%sKey Name: %8s  ", spaces, metadataItem->name);
    74     printf("Key pType: %d  ", metadataItem->pType);
    7574    printf("Key mdType: %d  ", metadataItem->type);
    7675
    … …  
    7978        printf("Key Value: %17c", ' ');
    8079        break;
    81     case PS_META_PRIMITIVE:
    82         switch(metadataItem->pType) {
    83         case PS_TYPE_BOOL:
    84             printf("Key Value: %15d  ", metadataItem->data.B);
    85             break;
    86         case PS_TYPE_S32:
    87             printf("Key Value: %15d  ", metadataItem->data.S32);
    88             break;
    89         case PS_TYPE_F32:
    90             printf("Key Value: %15.3f  ", metadataItem->data.F32);
    91             break;
    92         case PS_TYPE_F64:
    93             printf("Key Value: %15.3f  ", metadataItem->data.F64);
    94             break;
    95         default:
    96             printf("Bad type: %d ", metadataItem->pType);
    97         }
     80    case PS_META_BOOL:
     81        printf("Key Value: %15d  ", metadataItem->data.B);
     82        break;
     83    case PS_META_S32:
     84        printf("Key Value: %15d  ", metadataItem->data.S32);
     85        break;
     86    case PS_META_F32:
     87        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     88        break;
     89    case PS_META_F64:
     90        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    9891        break;
    9992    case PS_META_STR:

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

    r3264 r3341  
    1414*  @author  Ross Harman, MHPCC
    1515*
    16 *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
    17 *  @date  $Date: 2005-02-17 19:26:24 $
     16*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
     17*  @date  $Date: 2005-02-28 23:34:10 $
    1818*
    1919*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2828{
    2929    printf("Key Name: %8s  ", metadataItem->name);
    30     printf("Key pType: %2d  ", metadataItem->pType);
    3130    printf("Key mdType: %2d  ", metadataItem->type);
    3231
    … …  
    3534        printf("Key Value: %17c", ' ');
    3635        break;
    37     case PS_META_PRIMITIVE:
    38         switch(metadataItem->pType) {
    39         case PS_TYPE_BOOL:
    40             printf("Key Value: %15d  ", metadataItem->data.B);
    41             break;
    42         case PS_TYPE_S32:
    43             printf("Key Value: %15d  ", metadataItem->data.S32);
    44             break;
    45         case PS_TYPE_F32:
    46             printf("Key Value: %15.3f  ", metadataItem->data.F32);
    47             break;
    48         case PS_TYPE_F64:
    49             printf("Key Value: %15.3f  ", metadataItem->data.F64);
    50             break;
    51         default:
    52             printf("Bad type: %d ", metadataItem->pType);
    53         }
     36    case PS_META_BOOL:
     37        printf("Key Value: %15d  ", metadataItem->data.B);
     38        break;
     39    case PS_META_S32:
     40        printf("Key Value: %15d  ", metadataItem->data.S32);
     41        break;
     42    case PS_META_F32:
     43        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     44        break;
     45    case PS_META_F64:
     46        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    5447        break;
    5548    case PS_META_STR:
    … …  
    7669    // Test A - Allocate metadata items
    7770    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
    78     item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
    79     item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 111);
    80     item3 = psMetadataItemAlloc("myItem3", PS_TYPE_F32, PS_META_PRIMITIVE, "I am a single precision floating point", 222.222);
    81     item4 = psMetadataItemAlloc("myItem4", PS_TYPE_F64, PS_META_PRIMITIVE, "I am a double precision floating point", 333.333);
    82     item5 = psMetadataItemAlloc("myItem5", PS_TYPE_PTR, PS_META_STR, "I am a string", "HELLO WORLD");
     71    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
     72    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 111);
     73    item3 = psMetadataItemAlloc("myItem3", PS_META_F32, "I am a single precision floating point", 222.222);
     74    item4 = psMetadataItemAlloc("myItem4", PS_META_F64, "I am a double precision floating point", 333.333);
     75    item5 = psMetadataItemAlloc("myItem5", PS_META_STR, "I am a string", "HELLO WORLD");
    8376    printMetadataItem(item1);
    8477    printMetadataItem(item2);
    … …  
    9386                            "Null value for name not allowed", 0);
    9487    psLogMsg(__func__,PS_LOG_INFO,"Following should produce error for null name.");
    95     badItem = psMetadataItemAlloc(NULL, PS_TYPE_PTR, PS_META_STR, "I am a string", "HELLO WORLD");
     88    badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD");
    9689    if (badItem != NULL) {
    9790        psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item.");
    … …  
    10497    printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type",
    10598                            "Invalid psMetadataType: 6", 0);
    106     badItem = psMetadataItemAlloc("badItem", PS_TYPE_PTR, PS_META_NTYPE, "I am bad", "Bad comment");
     99    badItem = psMetadataItemAlloc("badItem", PS_META_NTYPE, "I am bad", "Bad comment");
    107100    printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true);
    108101

  • trunk/psLib/test/collections/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;

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

    r3264 r3341  
    2323*  @author  Ross Harman, MHPCC
    2424*
    25 *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
    26 *  @date  $Date: 2005-02-17 19:26:24 $
     25*  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
     26*  @date  $Date: 2005-02-28 23:34:10 $
    2727*
    2828*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3737{
    3838    printf("Key Name: %8s  ", metadataItem->name);
    39     printf("Key pType: %2d  ", metadataItem->pType);
    4039    printf("Key mdType: %2d  ", metadataItem->type);
    4140
    … …  
    4443        printf("Key Value: %17c", ' ');
    4544        break;
    46     case PS_META_PRIMITIVE:
    47         switch(metadataItem->pType) {
    48         case PS_TYPE_BOOL:
    49             printf("Key Value: %15d  ", metadataItem->data.B);
    50             break;
    51         case PS_TYPE_S32:
    52             printf("Key Value: %15d  ", metadataItem->data.S32);
    53             break;
    54         case PS_TYPE_F32:
    55             printf("Key Value: %15.3f  ", metadataItem->data.F32);
    56             break;
    57         case PS_TYPE_F64:
    58             printf("Key Value: %15.3f  ", metadataItem->data.F64);
    59             break;
    60         default:
    61             printf("Bad type: %d ", metadataItem->pType);
    62         }
     45    case PS_META_BOOL:
     46        printf("Key Value: %15d  ", metadataItem->data.B);
     47        break;
     48    case PS_META_S32:
     49        printf("Key Value: %15d  ", metadataItem->data.S32);
     50        break;
     51    case PS_META_F32:
     52        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     53        break;
     54    case PS_META_F64:
     55        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    6356        break;
    6457    case PS_META_STR:
    … …  
    9184    psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
    9285    metadata = psMetadataAlloc();
    93     item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
    94     item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 55);
    95     item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
    96     item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
    97     item5 = psMetadataItemAlloc("myItem5", PS_TYPE_F64, PS_META_PRIMITIVE, "I am a double", 3.14);
    98     item6 = psMetadataItemAlloc("myItem6", PS_TYPE_PTR, PS_META_VEC, "I am a vector", vec);
     86    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
     87    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
     88    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
     89    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
     90    item5 = psMetadataItemAlloc("myItem5", PS_META_F64, "I am a double", 3.14);
     91    item6 = psMetadataItemAlloc("myItem6", PS_META_VEC, "I am a vector", vec);
    9992    printMetadataItem(item1);
    10093    printMetadataItem(item2);
    … …  
    108101    psMetadataAddItem(metadata, item5, PS_LIST_HEAD);
    109102    psMetadataAddItem(metadata, item6, PS_LIST_HEAD);
     103    psFree(vec);
    110104    printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
    111105

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

    r3264 r3341  
    2222*  @author  Ross Harman, MHPCC
    2323*
    24 *  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
    25 *  @date  $Date: 2005-02-17 19:26:24 $
     24*  @version $Revision: 1.20 $  $Name: not supported by cvs2svn $
     25*  @date  $Date: 2005-02-28 23:34:10 $
    2626*
    2727*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636{
    3737    printf("Key Name: %8s  ", metadataItem->name);
    38     printf("Key pType: %2d  ", metadataItem->pType);
    3938    printf("Key mdType: %2d  ", metadataItem->type);
    4039
    … …  
    4342        printf("Key Value: %17c", ' ');
    4443        break;
    45     case PS_META_PRIMITIVE:
    46         switch(metadataItem->pType) {
    47         case PS_TYPE_BOOL:
    48             printf("Key Value: %15d  ", metadataItem->data.B);
    49             break;
    50         case PS_TYPE_S32:
    51             printf("Key Value: %15d  ", metadataItem->data.S32);
    52             break;
    53         case PS_TYPE_F32:
    54             printf("Key Value: %15.3f  ", metadataItem->data.F32);
    55             break;
    56         case PS_TYPE_F64:
    57             printf("Key Value: %15.3f  ", metadataItem->data.F64);
    58             break;
    59         default:
    60             printf("Bad type: %d ", metadataItem->pType);
    61         }
     44    case PS_META_BOOL:
     45        printf("Key Value: %15d  ", metadataItem->data.B);
     46        break;
     47    case PS_META_S32:
     48        printf("Key Value: %15d  ", metadataItem->data.S32);
     49        break;
     50    case PS_META_F32:
     51        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     52        break;
     53    case PS_META_F64:
     54        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    6255        break;
    6356    case PS_META_STR:
    … …  
    8780    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
    8881    metadata = psMetadataAlloc();
    89     item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
    90     item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 55);
    91     item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
    92     item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
    93     item5 = psMetadataItemAlloc("myItem5", PS_TYPE_F32, PS_META_PRIMITIVE, "I am a float", 3.14);
    94     item6 = psMetadataItemAlloc("myItem6", PS_TYPE_F64, PS_META_PRIMITIVE,"I am a double", 6.28);
    95     item7 = psMetadataItemAlloc("myItem7", PS_TYPE_PTR, PS_META_STR, "I am a string", "GNIRTS");
     82    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
     83    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
     84    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
     85    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
     86    item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14);
     87    item6 = psMetadataItemAlloc("myItem6", PS_META_F64,"I am a double", 6.28);
     88    item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS");
    9689    //    item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown");
    9790    printMetadataItem(item1);

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

    r3264 r3341  
    1313*  @author  Ross Harman, MHPCC
    1414*
    15 *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
    16 *  @date  $Date: 2005-02-17 19:26:24 $
     15*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
     16*  @date  $Date: 2005-02-28 23:34:10 $
    1717*
    1818*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727{
    2828    printf("Key Name: %8s  ", metadataItem->name);
    29     printf("Key pType: %2d  ", metadataItem->pType);
    3029    printf("Key mdType: %2d  ", metadataItem->type);
    3130
    … …  
    3433        printf("Key Value: %17c", ' ');
    3534        break;
    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         }
     35    case PS_META_BOOL:
     36        printf("Key Value: %15d  ", metadataItem->data.B);
     37        break;
     38    case PS_META_S32:
     39        printf("Key Value: %15d  ", metadataItem->data.S32);
     40        break;
     41    case PS_META_F32:
     42        printf("Key Value: %15.3f  ", metadataItem->data.F32);
     43        break;
     44    case PS_META_F64:
     45        printf("Key Value: %15.3f  ", metadataItem->data.F64);
    5346        break;
    5447    case PS_META_STR:
    … …  
    7467    // Test A - Allocate metadata and items
    7568    printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata and items");
    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);
     69    item1a = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
     70    item1b = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 111);
     71    item1c = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 222);
     72    item2a = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 333);
     73    item2b = psMetadataItemAlloc("myItem2", PS_META_LIST, "I am a folder node", NULL);
    8174    metadata = psMetadataAlloc();
    8275    printMetadataItem(item1a);

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

    r3264 r3341  
    99*  @author  Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
    12 *  @date  $Date: 2005-02-17 19:26:24 $
     11*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
     12*  @date  $Date: 2005-02-28 23:34:10 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3030        printf("psMetadataParseConfigXml returned error %d\n", res);
    3131    }
     32
    3233    psFree(md);
    3334    printFooter(stdout, "psMetadata", "Test A - Read an XML config file", true);
    34 
    3535
    3636    // Test B - Free data
Note: See TracChangeset for help on using the changeset viewer.