IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23921


Ignore:
Timestamp:
Apr 17, 2009, 4:41:36 PM (17 years ago)
Author:
eugene
Message:

convert -label options to multi where appropriate

Location:
trunk/ippTools/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/Makefile.am

    r23880 r23921  
    1919        regtool \
    2020        stacktool \
    21         warptool \
    22         receivetool
     21        warptool
     22
     23#       receivetool
    2324
    2425

  • trunk/ippTools/src/difftool.c

    r23904 r23921  
    412412    psMetadata *where = psMetadataAlloc();
    413413    PXOPT_COPY_S64(config->args, where,  "-diff_id", "diffRun.diff_id", "==");
    414     PXOPT_COPY_STR(config->args, where, "-label", "diffRun.label", "==");
     414    pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "==");
    415415
    416416    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    15051505
    15061506    psMetadata *where = psMetadataAlloc();
    1507     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     1507    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    15081508
    15091509    psString query = pxDataGet("difftool_pendingcleanuprun.sql");
    … …  
    15701570        PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "==");
    15711571    }
    1572     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     1572    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    15731573
    15741574    psString query = pxDataGet("difftool_pendingcleanupskyfile.sql");

  • trunk/ippTools/src/difftoolConfig.c

    r23904 r23921  
    8080    psMetadata *todiffskyfileArgs = psMetadataAlloc();
    8181    psMetadataAddS64(todiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,            "search by diff ID", 0);
    82     psMetadataAddStr(todiffskyfileArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0);
     82    psMetadataAddStr(todiffskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", 0);
    8383    psMetadataAddU64(todiffskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    8484    psMetadataAddBool(todiffskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    … …  
    190190    // -pendingcleanuprun
    191191    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
    192     psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     192    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    193193    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    194194    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    … …  
    196196    // -pendingcleanupskyfile
    197197    psMetadata *pendingcleanupskyfileArgs = psMetadataAlloc();
    198     psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     198    psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    199199    psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,          "search by diff ID", 0);
    200200    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);

  • trunk/ippTools/src/faketool.c

    r23873 r23921  
    128128    PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<=");
    129129    PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "==");
    130     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     130    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    131131    PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "==");
    132132    PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "==");
    … …  
    376376
    377377    psMetadata *where = psMetadataAlloc();
     378    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    378379    PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "==");
    379     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
    380380    PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
    381381    PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "==");
    … …  
    442442    psMetadata *where = psMetadataAlloc();
    443443    PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "==");
    444     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     444    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    445445    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
    446446    PXOPT_COPY_STR(config->args, where, "-class_id", "rawImfile.class_id", "==");
    … …  
    895895
    896896    psMetadata *where = psMetadataAlloc();
    897     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     897    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    898898
    899899    psString query = pxDataGet("faketool_pendingcleanuprun.sql");
    … …  
    960960        PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "==");
    961961    }
    962     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     962    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    963963
    964964    psString query = pxDataGet("faketool_pendingcleanupimfile.sql");
    … …  
    10791079    psMetadata *where = psMetadataAlloc();
    10801080    PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "==");
    1081     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     1081    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    10821082
    10831083    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);

  • trunk/ippTools/src/faketoolConfig.c

    r23873 r23921  
    5454    psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0,            "search for exposures by time (<)", NULL);
    5555    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag",  0,            "search by exp_tag", NULL);
    56     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-label",  0,            "search by label", NULL);
     56    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
    5757    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exp_type", "object");
    5858    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel",  0,            "search by filelevel", NULL);
    … …  
    148148    psMetadata *pendingexpArgs = psMetadataAlloc();
    149149    psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-fake_id", 0,            "search by fake ID", 0);
    150     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     150    psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
    151151    psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0,            "search by camtool ID", 0);
    152152    psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0,            "search by chiptool ID", 0);
    … …  
    157157    psMetadata *pendingimfileArgs = psMetadataAlloc();
    158158    psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-fake_id",  0,            "search by fake ID", 0);
    159     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     159    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
    160160    psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
    161161    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    … …  
    245245    psMetadata *advanceexpArgs = psMetadataAlloc();
    246246    psMetadataAddS64(advanceexpArgs, PS_LIST_TAIL, "-fake_id", 0,      "search by fake ID", 0);
    247     psMetadataAddStr(advanceexpArgs, PS_LIST_TAIL, "-label",  0,      "search by label ", NULL);
     247    psMetadataAddStr(advanceexpArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label ", NULL);
    248248    psMetadataAddU64(advanceexpArgs, PS_LIST_TAIL, "-limit",  0,       "limit exposures to advance to N items", 0);
    249249
    … …  
    270270    // -pendingcleanuprun
    271271    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
    272     psMetadataAddStr(pendingcleanuprunArgs,  PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     272    psMetadataAddStr(pendingcleanuprunArgs,  PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    273273    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    274274    psMetadataAddU64(pendingcleanuprunArgs,  PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    … …  
    276276    // -pendingcleanupimfile
    277277    psMetadata *pendingcleanupimfileArgs = psMetadataAlloc();
    278     psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     278    psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    279279    psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-fake_id", 0,          "search by chip ID", 0);
    280280    psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);

  • trunk/ippTools/src/stacktool.c

    r23873 r23921  
    617617    PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
    618618    PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
    619     PXOPT_COPY_STR(config->args, where, "-label", "stackRun.label", "==");
     619    pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "==");
    620620
    621621    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    991991
    992992    psMetadata *where = psMetadataAlloc();
    993     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     993    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    994994
    995995    psString query = pxDataGet("stacktool_pendingcleanuprun.sql");
    … …  
    10551055        PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
    10561056    }
    1057     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     1057    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    10581058
    10591059    psString query = pxDataGet("stacktool_pendingcleanupskyfile.sql");

  • trunk/ippTools/src/stacktoolConfig.c

    r23873 r23921  
    114114    psMetadata *tosumArgs = psMetadataAlloc();
    115115    psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-stack_id", 0,            "search by stack ID", 0);
    116     psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     116    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
    117117    psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
    118118    psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    … …  
    167167    // -pendingcleanuprun
    168168    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
    169     psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     169    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    170170    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    171171    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    … …  
    173173    // -pendingcleanupskyfile
    174174    psMetadata *pendingcleanupskyfileArgs = psMetadataAlloc();
    175     psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     175    psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    176176    psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,          "search by stack ID", 0);
    177177    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);

  • trunk/ippTools/src/warptool.c

    r23873 r23921  
    230230    PXOPT_COPY_F32(config->args, where, "-solang_min",         "rawExp.solang",         ">=");
    231231    PXOPT_COPY_F32(config->args, where, "-solang_max",         "rawExp.solang",         "<");
    232     PXOPT_COPY_STR(config->args, where, "-reduction", "fakeRun.reduction", "==");
    233     PXOPT_COPY_STR(config->args, where, "-label",     "fakeRun.label",     "==");
     232    PXOPT_COPY_STR(config->args, where, "-reduction",          "fakeRun.reduction",    "==");
     233    pxAddLabelSearchArgs (config, where, "-label",             "fakeRun.label",         "==");
    234234
    235235    if (!psListLength(where->list) &&
    … …  
    556556    psMetadata *where = psMetadataAlloc();
    557557    PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
    558     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     558    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    559559
    560560    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    828828    psMetadata *where = psMetadataAlloc();
    829829    PXOPT_COPY_S64(config->args, where, "-warp_id", "warpSkyCellMap.warp_id", "==");
    830     PXOPT_COPY_STR(config->args, where, "-label", "warpRun.label", "==");
     830    pxAddLabelSearchArgs (config, where, "-label", "warpRun.label", "==");
    831831
    832832    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    13181318
    13191319    psMetadata *where = psMetadataAlloc();
    1320     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     1320    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    13211321
    13221322    psString query = pxDataGet("warptool_pendingcleanuprun.sql");
    … …  
    13811381    psMetadata *where = psMetadataAlloc();
    13821382    PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
    1383     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     1383    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    13841384
    13851385    psString query = pxDataGet("warptool_pendingcleanupskyfile.sql");

  • trunk/ippTools/src/warptoolConfig.c

    r23873 r23921  
    9292    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_max",         0, "search by max solar angle", NAN);
    9393    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",          0, "search by fakeRun reduction class", NULL);
    94     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label",              0, "search on fakeRun label", NULL);
     94    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search on fakeRun label", NULL);
    9595    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_mode",           0, "define mode (warp, diff, stack, magic)", NULL);
    9696    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",        0, "define workdir", NULL);
    … …  
    147147    psMetadata *tooverlapArgs = psMetadataAlloc();
    148148    psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
    149     psMetadataAddStr(tooverlapArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     149    psMetadataAddStr(tooverlapArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
    150150    psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    151151    psMetadataAddBool(tooverlapArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    … …  
    169169    psMetadata *towarpedArgs = psMetadataAlloc();
    170170    psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
    171     psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     171    psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
    172172    psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    173173    psMetadataAddBool(towarpedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    … …  
    233233    // -pendingcleanuprun
    234234    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
    235     psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     235    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    236236    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    237237    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    … …  
    239239    // -pendingcleanupskyfile
    240240    psMetadata *pendingcleanupskyfileArgs = psMetadataAlloc();
    241     psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     241    psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
    242242    psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,          "search by warp ID (required)", 0);
    243243    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
Note: See TracChangeset for help on using the changeset viewer.