IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 2, 2009, 12:03:23 PM (17 years ago)
Author:
eugene
Message:

merge from head

Location:
branches/eam_branches/20090715/ippTools/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/20090715/ippTools/src/chiptool.c

    r25400 r25744  
    603603    PXOPT_COPY_STR(config->args, where, "-reduction", "chipRun.reduction", "==");
    604604    pxAddLabelSearchArgs (config, where, "-label", "chipRun.label", "LIKE");
    605     PXOPT_COPY_S64(config->args, where, "-magicked", "chipRun.magicked", "==");
     605    PXOPT_COPY_S64(config->args, where, "-magicked", "chipProcessedImfile.magicked", "==");
     606
     607    PXOPT_LOOKUP_U64(magicked, config->args, "-magicked", false, false);
     608    PXOPT_LOOKUP_BOOL(destreaked, config->args,     "-destreaked", false);
     609    PXOPT_LOOKUP_BOOL(not_destreaked, config->args, "-not_destreaked", false);
    606610
    607611    if (!psListLength(where->list) &&
    … …  
    631635        // don't list faulted rows
    632636        psStringAppend(&query, " %s", "AND chipProcessedImfile.fault = 0");
     637    }
     638    if (not_destreaked) {
     639        if (destreaked) {
     640            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -destreaked makes no sense");
     641            return false;
     642        }
     643        if (magicked) {
     644            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -magicked makes no sense");
     645            return false;
     646        }
     647        psStringAppend(&query, " AND chipProcessedImfile.magicked = 0");
     648    }
     649    if (destreaked) {
     650        psStringAppend(&query, " AND chipProcessedImfile.magicked != 0");
    633651    }
    634652

  • branches/eam_branches/20090715/ippTools/src/chiptoolConfig.c

    r25400 r25744  
    158158    psMetadataAddStr(processedimfileArgs,  PS_LIST_TAIL, "-reduction",          0, "search by reduction class", NULL);
    159159    psMetadataAddStr(processedimfileArgs,  PS_LIST_TAIL, "-label",  PS_META_DUPLICATE_OK, "search by chipRun label (LIKE comparison)", NULL);
    160     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-magicked",  0,        "search by magicked status", false);
     160
     161    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-destreaked",  0,      "search for destreaked images", false);
     162    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-not_destreaked",  0,  "search for images that have not been destreaked", false);
     163    psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-magicked",  0,        "search by magicked value", 0);
    161164    psMetadataAddU64(processedimfileArgs,  PS_LIST_TAIL, "-limit",  0,           "limit result set to N items", 0);
    162165    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-all",  0,            "list everything without search terms", false);

  • branches/eam_branches/20090715/ippTools/src/difftool.c

    r25624 r25744  
    665665    PXOPT_COPY_S64(config->args, where,  "-diff_id", "diffSkyfile.diff_id", "==");
    666666    PXOPT_COPY_STR(config->args, where, "-skycell_id", "diffInputSkyfile.skycell_id", "==");
    667     PXOPT_COPY_S64(config->args, where,  "-diff_skyfile_id", "diffInputSkyfile.diff_skyfile_id", "==");
     667    PXOPT_COPY_S64(config->args, where, "-diff_skyfile_id", "diffInputSkyfile.diff_skyfile_id", "==");
    668668    PXOPT_COPY_STR(config->args, where, "-tess_id", "diffRun.tess_id", "==");
    669669    PXOPT_COPY_S16(config->args, where, "-fault", "diffSkyfile.fault", "==");
    670     PXOPT_COPY_S64(config->args, where, "-exp_id", "rawInput.exp_id", "==");
    671     PXOPT_COPY_STR(config->args, where, "-exp_name", "rawInput.exp_name", "==");
    672     PXOPT_COPY_STR(config->args, where, "-warp_id", "warpInput.warp_id", "==");
    673 
     670    PXOPT_COPY_S64(config->args, where,  "-magicked", "diffSkyfile.magicked", "==");
     671    pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "LIKE");
     672
     673    PXOPT_LOOKUP_BOOL(template, config->args, "-template", false);
     674    if (!template) {
     675        PXOPT_COPY_S64(config->args, where, "-exp_id", "rawInput.exp_id", "==");
     676        PXOPT_COPY_STR(config->args, where, "-exp_name", "rawInput.exp_name", "==");
     677        PXOPT_COPY_STR(config->args, where, "-warp_id", "warpInput.warp_id", "==");
     678        PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawInput.dateobs",  ">=");
     679        PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "rawInput.dateobs",  "<=");
     680        PXOPT_COPY_STR(config->args, where, "-filter",     "rawInput.filter", "==");
     681    } else {
     682        PXOPT_COPY_S64(config->args, where, "-exp_id", "rawTemplate.exp_id", "==");
     683        PXOPT_COPY_STR(config->args, where, "-exp_name", "rawTemplate.exp_name", "==");
     684        PXOPT_COPY_STR(config->args, where, "-warp_id", "warpTemplate.warp_id", "==");
     685        PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawTemplate.dateobs",  ">=");
     686        PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "rawTemplate.dateobs",  "<=");
     687        PXOPT_COPY_STR(config->args, where, "-filter",     "rawTemplate.filter", "==");
     688    }
     689
     690    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
    674691    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    675692    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     693
     694    PXOPT_LOOKUP_U64(magicked, config->args,        "-magicked", false, false);
     695    PXOPT_LOOKUP_BOOL(destreaked, config->args,     "-destreaked", false);
     696    PXOPT_LOOKUP_BOOL(not_destreaked, config->args, "-not_destreaked", false);
    676697
    677698    psString query = pxDataGet("difftool_skyfile.sql");
    … …  
    685706        psStringAppend(&query, " WHERE %s", whereClause);
    686707        psFree(whereClause);
     708    } else if (!all) {
     709        psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
    687710    }
    688711    psFree(where);
     712
     713    if (not_destreaked) {
     714        if (destreaked) {
     715            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -destreaked makes no sense");
     716            return false;
     717        }
     718        if (magicked) {
     719            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -magicked makes no sense");
     720            return false;
     721        }
     722        psStringAppend(&query, " AND diffSkyfile.magicked = 0");
     723    }
     724    if (destreaked) {
     725        psStringAppend(&query, " AND diffSkyfile.magicked != 0");
     726    }
     727
    689728
    690729    // treat limit == 0 as "no limit"

  • branches/eam_branches/20090715/ippTools/src/difftoolConfig.c

    r25624 r25744  
    123123    // -diffskyfile
    124124    psMetadata *diffskyfileArgs = psMetadataAlloc();
    125     psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,            "search by diff ID", 0);
    126     psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id",  0,       "define skycell ID", NULL);
    127     psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-diff_skyfile_id", 0,    "search by diff_skyfile_id ID", 0);
    128     psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-tess_id",  0,            "define tessellation ID", NULL);
    129     psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "define exposure ID", 0);
    130     psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-exp_name",  0,         "define exposure name", NULL);
    131     psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-warp_id",  0,         "define warp_id", NULL);
    132     psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    133     psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    134     psMetadataAddS16(diffskyfileArgs, PS_LIST_TAIL, "-fault",  0,            "define fault code", 0);
     125    psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL,  "-diff_id", 0,           "search by diff ID", 0);
     126    psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id",  0,      "search by skycell ID", NULL);
     127    psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL,  "-diff_skyfile_id", 0,   "search by diff_skyfile_id ID", 0);
     128    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL,  "-tess_id",  0,          "search by tessellation ID", NULL);
     129    psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-warp_id",  0,         "search by warp_id", NULL);
     130    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-template",  0,        "apply exposure args to template of bothways diff", false);
     131    psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL,  "-exp_id",  0,           "search by exposure ID", 0);
     132    psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-exp_name",  0,        "search by exposure name", NULL);
     133    psMetadataAddTime(diffskyfileArgs, PS_LIST_TAIL, "-dateobs_begin", 0,    "search for exposures by time (>=)", NULL);
     134    psMetadataAddTime(diffskyfileArgs, PS_LIST_TAIL, "-dateobs_end", 0,      "search for exposures by time (<=)", NULL);
     135    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL,  "-filter", 0,           "search for filter", NULL);
     136    psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL,  "-magicked", 0,         "search by magicked value", 0);
     137    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-destreaked",  0,      "search for destreaked images", false);
     138    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-not_destreaked",  0,  "search for images that are not destreaked", false);
     139    psMetadataAddStr(diffskyfileArgs,  PS_LIST_TAIL, "-label",  PS_META_DUPLICATE_OK, "search by diffRun label (LIKE comparison)", NULL);
     140    psMetadataAddS16(diffskyfileArgs, PS_LIST_TAIL,  "-fault",  0,           "search by fault code", 0);
     141
     142    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-all",  0,             "search without arguments", false);
     143    psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL,  "-limit",  0,            "limit result set to N items", 0);
     144    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple",  0,          "use the simple output format", false);
    135145
    136146    // -revertdiffskyfile

  • branches/eam_branches/20090715/ippTools/src/pstamptool.c

    r25624 r25744  
    544544    PXOPT_LOOKUP_S16(fault,       config->args, "-fault",      false, false);
    545545    PXOPT_LOOKUP_S64(exp_id,      config->args, "-exp_id",     false, false);
     546    PXOPT_LOOKUP_S64(options,     config->args, "-options",     false, false);
    546547
    547548    // unless the job is being inserted with stop state require outputBase
    … …  
    568569            fault,
    569570            exp_id,
    570             outputBase
     571            outputBase,
     572            options
    571573            )) {
    572574        psError(PS_ERR_UNKNOWN, false, "database error");
    … …  
    592594    PS_ASSERT_PTR_NON_NULL(config, false);
    593595
    594     PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", false, false);
    595     PXOPT_LOOKUP_S64(job_id, config->args, "-job_id", false, false);
     596    psMetadata *where = psMetadataAlloc();
     597    PXOPT_COPY_S64(config->args, where, "-job_id", "job_id", "==");
     598    PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
     599    PXOPT_COPY_S64(config->args, where, "-fault",  "fault", "==");
    596600
    597601    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    598602    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    599603
    600     psString query = NULL;
    601 
    602     if (!req_id && !job_id) {
    603         fprintf(stderr, "either req_id or job_id must be specified\n");
     604    if (!psListLength(where->list)) {
     605        fprintf(stderr, "search arguments are required\n");
    604606        exit (1);
    605607    }
    606608
    607     if (req_id) {
    608         psStringAppend(&query,
    609                 "SELECT"
    610                 " pstampJob.*, pstampRequest.name, pstampRequest.outProduct"
    611                 " FROM pstampJob"
    612                 " JOIN pstampRequest USING(req_id)"
    613                 " WHERE req_id = %" PRId64, req_id
    614             );
    615     } else {
    616         psStringAppend(&query,
    617                 "SELECT"
    618                 " pstampJob.*, pstampRequest.name, pstampRequest.outProduct"
    619                 " FROM pstampJob"
    620                 " JOIN pstampRequest USING(req_id)"
    621                 " WHERE job_id = %" PRId64, job_id
    622             );
    623     }
     609    psString query = pxDataGet("pstamptool_listjob.sql");
     610    if (!query) {
     611        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     612        return false;
     613    }
     614
     615    // use psDBGenerateWhereSQL because the SQL yields an intermediate table
     616    if (psListLength(where->list)) {
     617        psString whereClause = psDBGenerateWhereConditionSQL(where, "pstampJob");
     618        psStringAppend(&query, " WHERE %s", whereClause);
     619        psFree(whereClause);
     620    }
     621    psFree(where);
    624622
    625623    // treat limit == 0 as "no limit"

  • branches/eam_branches/20090715/ippTools/src/pstamptoolConfig.c

    r25624 r25744  
    105105    // -addjob
    106106    psMetadata *addjobArgs = psMetadataAlloc();
    107     psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-req_id", 0,            "define job req_id", 0);
    108     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0,            "define job rownum", NULL);
    109     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,            "define job job_type", "stamp");
    110     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,            "define job outputBase", NULL);
    111     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0,            "new state", "run");
    112     psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-exp_id", 0,           "exposure id", 0);
    113     psMetadataAddS16(addjobArgs, PS_LIST_TAIL, "-fault", 0,            "new result", 0);
     107    psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-req_id", 0,           "define job req_id", 0);
     108    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0,           "define job rownum", NULL);
     109    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,         "define job job_type", "stamp");
     110    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,       "define job outputBase", NULL);
     111    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0,            "define state", "run");
     112    psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-exp_id", 0,           "define exposure id", 0);
     113    psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-options", 0,          "define options", 0);
     114    psMetadataAddS16(addjobArgs, PS_LIST_TAIL, "-fault", 0,            "define job result", 0);
    114115
    115116    // -listjob
    116117    psMetadata *listjobArgs = psMetadataAlloc();
    117     psMetadataAddS64(listjobArgs, PS_LIST_TAIL, "-req_id", 0,            "define request", 0);
    118     psMetadataAddS64(listjobArgs, PS_LIST_TAIL, "-job_id", 0,            "define job", 0);
    119     psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    120     psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
     118    psMetadataAddS64(listjobArgs, PS_LIST_TAIL, "-req_id", 0,          "select by request ID", 0);
     119    psMetadataAddS64(listjobArgs, PS_LIST_TAIL, "-job_id", 0,          "select by job ID", 0);
     120    psMetadataAddS16(listjobArgs, PS_LIST_TAIL, "-fault", 0,           "select by fault", 0);
     121    psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit",  0,          "limit result set to N items", 0);
     122    psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0,         "use the simple output format", false);
    121123
    122124    // -pendingjob

  • branches/eam_branches/20090715/ippTools/src/regtool.c

    r25624 r25744  
    333333    PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs",  ">=");
    334334    PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "dateobs",  "<=");
     335    PXOPT_COPY_STR(config->args, where,  "-filter",        "filter", "==");
     336    PXOPT_COPY_S64(config->args, where,  "-magicked",      "magicked", "==");
     337
     338    PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false);
     339    PXOPT_LOOKUP_BOOL(destreaked, config->args,     "-destreaked", false);
     340    PXOPT_LOOKUP_BOOL(not_destreaked, config->args, "-not_destreaked", false);
    335341
    336342    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    360366        psStringAppend(&query, " %s", "AND rawImfile.fault = 0");
    361367    }
     368
     369    if (not_destreaked) {
     370        if (destreaked) {
     371            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -destreaked makes no sense");
     372            return false;
     373        }
     374        if (magicked) {
     375            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -magicked makes no sense");
     376            return false;
     377        }
     378        psStringAppend(&query, " AND rawImfile.magicked = 0");
     379    }
     380    if (destreaked) {
     381        psStringAppend(&query, " AND rawImfile.magicked != 0");
     382    }
     383
    362384
    363385    // add the ORDER BY statement if desired

  • branches/eam_branches/20090715/ippTools/src/regtoolConfig.c

    r25624 r25744  
    136136    ADD_OPT(Str,  processedimfileArgs, "-exp_name",  "search by exposure name",               NULL);
    137137    ADD_OPT(Str,  processedimfileArgs, "-class_id",  "search by class ID",                    NULL);
     138    ADD_OPT(Str,  processedimfileArgs, "-filter",  "search by filter",                        NULL);
    138139    ADD_OPT(Time, processedimfileArgs, "-dateobs_begin", "search for exposures by time (>=)", NULL);
    139140    ADD_OPT(Time, processedimfileArgs, "-dateobs_end", "search for exposures by time (<)", NULL);
     141    ADD_OPT(S64,  processedimfileArgs, "-magicked",    "search by magicked value",            0);
     142    ADD_OPT(Bool, processedimfileArgs, "-destreaked",   "only return imfiles that have been destreaked", false);
     143    ADD_OPT(Bool, processedimfileArgs, "-not_destreaked", "only return imfiles that have not been destreaked", false);
    140144    ADD_OPT(U64,  processedimfileArgs, "-limit",     "limit result set to N items",           0);
    141145    ADD_OPT(Bool, processedimfileArgs, "-faulted",   "only return imfiles with a fault status set", false);

  • branches/eam_branches/20090715/ippTools/src/stacktool.c

    r25624 r25744  
    859859
    860860    psMetadata *where = psMetadataAlloc();
    861     PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "==");
    862861    PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "==");
    863     PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
    864     PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
    865862    PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "==");
    866863    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "==");
     864    PXOPT_COPY_STR(config->args, where, "-filter", "stackRun.filter", "LIKE");
     865    PXOPT_COPY_STR(config->args, where, "-label", "stackRun.label", "==");
     866    PXOPT_COPY_S16(config->args, where, "-fault", "stackSumSkyfile.fault", "==");
     867
     868//  The following three selectors are incompatible with the sql so omit them
     869//    PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "==");
     870//     PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
     871//    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
     872
     873    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
    867874
    868875    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    879886        psStringAppend(&query, " WHERE %s", whereClause);
    880887        psFree(whereClause);
    881     }
     888    } else if (!all) {
     889        psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
     890        return false;
     891    }
     892
    882893    psFree(where);
    883894

  • branches/eam_branches/20090715/ippTools/src/stacktoolConfig.c

    r25624 r25744  
    164164    psMetadata *sumskyfileArgs= psMetadataAlloc();
    165165    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,            "search by stack ID", 0);
    166     psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
    167166    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-tess_id", 0,            "search by tess ID", 0);
    168167    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,         "search by skycell ID", 0);
     168#ifdef notdef
     169    // These don't work so omit (for now) We probably should create a different mode for this type of search.
     170    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
    169171    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-exp_id", 0,            "search by exposure ID", 0);
    170172    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-exp_name", 0,          "search by exposure name", NULL);
     173#endif
     174    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-label", 0,             "search by stackRun.label", NULL);
     175    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-filter", 0,            "search by filter (LIKE comparison)", NULL);
     176    psMetadataAddS16(sumskyfileArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
    171177    psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    172178    psMetadataAddBool(sumskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     179    psMetadataAddBool(sumskyfileArgs, PS_LIST_TAIL, "-all",  0,            "enable search without arguments", false);
    173180
    174181    // -revertsumskyfile

  • branches/eam_branches/20090715/ippTools/src/warptool.c

    r25400 r25744  
    11981198    PXOPT_COPY_STR(config->args, where, "-exp_name",   "rawExp.exp_name", "==");
    11991199    PXOPT_COPY_S64(config->args, where, "-fake_id",    "fakeRun.fake_id", "==");
     1200    PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs",  ">=");
     1201    PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "rawExp.dateobs",  "<=");
     1202    PXOPT_COPY_STR(config->args, where, "-filter",    "rawExp.filter", "==");
     1203    PXOPT_COPY_S64(config->args, where, "-magicked", "warpSkyfile.magicked", "==");
     1204    pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
     1205
     1206    PXOPT_LOOKUP_U64(magicked, config->args, "-magicked", false, false);
     1207    PXOPT_LOOKUP_BOOL(destreaked, config->args,     "-destreaked", false);
     1208    PXOPT_LOOKUP_BOOL(not_destreaked, config->args, "-not_destreaked", false);
     1209
     1210    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
    12001211
    12011212    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    12131224        psStringAppend(&query, " AND %s", whereClause);
    12141225        psFree(whereClause);
     1226    } else if (!all) {
     1227        psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
     1228        return false;
    12151229    }
    12161230    psFree(where);
     1231
     1232    if (not_destreaked) {
     1233        if (destreaked) {
     1234            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -destreaked makes no sense");
     1235            return false;
     1236        }
     1237        if (magicked) {
     1238            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -magicked makes no sense");
     1239            return false;
     1240        }
     1241        psStringAppend(&query, " AND warpSkyfile.magicked = 0");
     1242    }
     1243    if (destreaked) {
     1244        psStringAppend(&query, " AND warpSkyfile.magicked != 0");
     1245    }
    12171246
    12181247    // treat limit == 0 as "no limit"

  • branches/eam_branches/20090715/ippTools/src/warptoolConfig.c

    r25400 r25744  
    215215    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_name", 0,          "search by exposure tag", 0);
    216216    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0,           "search by phase 3 version of exposure tag", 0);
     217    psMetadataAddTime(warpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0,    "search for exposures by time (>=)", NULL);
     218    psMetadataAddTime(warpedArgs, PS_LIST_TAIL, "-dateobs_end", 0,      "search for exposures by time (<=)", NULL);
     219    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-filter", 0,           "search for exposures by filter", NULL);
     220    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-destreaked",  0,      "search for destreaked images", false);
     221    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-not_destreaked",  0,  "search for images that have not been destreaked", false);
     222    psMetadataAddS64(warpedArgs, PS_LIST_TAIL,  "-magicked", 0,         "search by magicked value", 0);
     223    psMetadataAddS16(warpedArgs, PS_LIST_TAIL,  "-fault",  0,           "search by fault code", 0);
     224    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-label",  PS_META_DUPLICATE_OK, "search by warpRun label", NULL);
     225
     226    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-all",  0,             "search without arguments", false);
    217227    psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    218228    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple",  0,          "use the simple output format", false);
Note: See TracChangeset for help on using the changeset viewer.