IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25775


Ignore:
Timestamp:
Oct 5, 2009, 2:15:48 PM (17 years ago)
Author:
bills
Message:

For the lookup modes add arguments to lookup by ra, decl

Location:
trunk/ippTools/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/chiptool.c

    r25706 r25775  
    605605    PXOPT_COPY_S64(config->args, where, "-magicked", "chipProcessedImfile.magicked", "==");
    606606
    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);
    610 
    611     if (!psListLength(where->list) &&
    612         !psMetadataLookupBool(NULL, config->args, "-all")) {
    613         psFree(where);
    614         psError(PXTOOLS_ERR_DATA, false, "search parameters (or -all) are required");
     607    psString where2 = NULL;
     608    pxmagicAddWhere(config, &where2, "chipProcessedImfile");
     609    // add cuts on ra and decl if supplied
     610    if (!pxspaceAddWhere(config, &where2, "rawExp")) {
     611        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
    615612        return false;
    616613    }
    … …  
    622619    }
    623620
    624     if (where && psListLength(where->list)) {
     621    if (psListLength(where->list)) {
    625622        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    626623        psStringAppend(&query, " WHERE %s", whereClause);
    627624        psFree(whereClause);
     625    } else if (!psMetadataLookupBool(NULL, config->args, "-all") && (faulted || where2)) {
     626        psStringAppend(&query, " WHERE chipRun.chip_id IS NOT NULL %s", where2);
     627    } else {
     628        psFree(where);
     629        psError(PXTOOLS_ERR_DATA, false, "search parameters (or -all) are required");
     630        return false;
    628631    }
    629632    psFree(where);
    … …  
    635638        // don't list faulted rows
    636639        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");
    651640    }
    652641

  • trunk/ippTools/src/chiptoolConfig.c

    r25702 r25775  
    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 
    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);
     160    pxmagicAddArguments(processedimfileArgs);
     161
    164162    psMetadataAddU64(processedimfileArgs,  PS_LIST_TAIL, "-limit",  0,           "limit result set to N items", 0);
    165163    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-all",  0,            "list everything without search terms", false);
    166164    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted",  0,        "only return imfiles with a fault status set", false);
    167165    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,         "use the simple output format", false);
     166
     167    pxspaceAddArguments(processedimfileArgs);
    168168
    169169    // -revertprocessedimfile

  • trunk/ippTools/src/difftool.c

    r25704 r25775  
    692692    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    693693
    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);
    697 
     694
     695    psString where2 = NULL;
     696    pxmagicAddWhere(config, &where2, "diffSkyfile");
     697    pxspaceAddWhere(config, &where2, template ? "rawTemplate" : "rawInput");
    698698    psString query = pxDataGet("difftool_skyfile.sql");
    699699    if (!query) {
    … …  
    706706        psStringAppend(&query, " WHERE %s", whereClause);
    707707        psFree(whereClause);
    708     } else if (!all) {
     708    } else if (all) {
     709        if (where2) {
     710            psStringAppend(&query, " WHERE diffRun.diff_id is not null %s", where2);
     711        }
     712    } else {
    709713        psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
     714        return false;
    710715    }
    711716    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 
    728717
    729718    // treat limit == 0 as "no limit"

  • trunk/ippTools/src/difftoolConfig.c

    r25704 r25775  
    134134    psMetadataAddTime(diffskyfileArgs, PS_LIST_TAIL, "-dateobs_end", 0,      "search for exposures by time (<=)", NULL);
    135135    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);
    139136    psMetadataAddStr(diffskyfileArgs,  PS_LIST_TAIL, "-label",  PS_META_DUPLICATE_OK, "search by diffRun label (LIKE comparison)", NULL);
    140137    psMetadataAddS16(diffskyfileArgs, PS_LIST_TAIL,  "-fault",  0,           "search by fault code", 0);
     138    pxmagicAddArguments(diffskyfileArgs);
     139    pxspaceAddArguments(diffskyfileArgs);
    141140
    142141    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-all",  0,             "search without arguments", false);

  • trunk/ippTools/src/regtool.c

    r25705 r25775  
    334334    PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "dateobs",  "<=");
    335335    PXOPT_COPY_STR(config->args, where,  "-filter",        "filter", "==");
     336    PXOPT_COPY_STR(config->args, where,  "-exp_type",      "exp_type", "==");
     337    PXOPT_COPY_STR(config->args, where,  "-obs_mode",      "obs_mode", "==");
    336338    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);
    341339
    342340    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    343341    PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false);
    344342    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     343    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
    345344    PXOPT_LOOKUP_BOOL(ordered_by_date, config->args, "-ordered_by_date", false);
     345
     346    // build where string for some parameters that don't fit PXOPT_COPY*
     347    psString where2 = NULL;
     348    if (!pxmagicAddWhere(config, &where2, "rawImfile")) {
     349        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
     350        return false;
     351    }
     352    if (!pxspaceAddWhere(config, &where2, "rawImfile")) {
     353        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
     354        return false;
     355    }
    346356
    347357    psString query = pxDataGet("regtool_processedimfile.sql");
    … …  
    356366        psStringAppend(&query, " AND %s", whereClause);
    357367        psFree(whereClause);
     368    } else if (!all && !where2) {
     369        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
     370        return false;
    358371    }
    359372    psFree(where);
     373    if (where2) {
     374        psStringAppend(&query, where2);
     375        psFree(where2);
     376    }
    360377
    361378    if (faulted) {
    … …  
    366383        psStringAppend(&query, " %s", "AND rawImfile.fault = 0");
    367384    }
    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 
    384385
    385386    // add the ORDER BY statement if desired

  • trunk/ippTools/src/regtoolConfig.c

    r25705 r25775  
    137137    ADD_OPT(Str,  processedimfileArgs, "-class_id",  "search by class ID",                    NULL);
    138138    ADD_OPT(Str,  processedimfileArgs, "-filter",  "search by filter",                        NULL);
     139    ADD_OPT(Str,  processedimfileArgs, "-obs_mode",  "search by obs_mod",                        NULL);
     140    ADD_OPT(Str,  processedimfileArgs, "-exp_type",  "search by exposure type",                        NULL);
    139141    ADD_OPT(Time, processedimfileArgs, "-dateobs_begin", "search for exposures by time (>=)", NULL);
    140142    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);
    144143    ADD_OPT(U64,  processedimfileArgs, "-limit",     "limit result set to N items",           0);
    145144    ADD_OPT(Bool, processedimfileArgs, "-faulted",   "only return imfiles with a fault status set", false);
     145    ADD_OPT(Bool, processedimfileArgs, "-all",   "list without search arguments", false);
    146146    ADD_OPT(Bool, processedimfileArgs, "-simple",    "use the simple output format",          false);
    147147    ADD_OPT(Bool, processedimfileArgs, "-ordered_by_date", "force output to be in DATE order", false);
     148    pxspaceAddArguments(processedimfileArgs);
     149    pxmagicAddArguments(processedimfileArgs);
    148150
    149151    // -revertprocessedimfile

  • trunk/ippTools/src/warptool.c

    r25703 r25775  
    12041204    pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
    12051205
    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 
    12101206    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
    12111207
    … …  
    12201216    }
    12211217
     1218    // generate where strings for arguments that require extra processing
     1219    // beyond PXOPT_COPY*
     1220    psString where2 = NULL;
     1221    if (!pxmagicAddWhere(config, &where2, "warpSkyfile")) {
     1222        psError(PXTOOLS_ERR_DATA, false, "pxMagicAddWhere failed");
     1223        return false;
     1224    }
     1225    if (!pxspaceAddWhere(config, &where2, "rawExp")) {
     1226        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
     1227        return false;
     1228    }
     1229
    12221230    if (psListLength(where->list)) {
    12231231        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    12241232        psStringAppend(&query, " AND %s", whereClause);
    12251233        psFree(whereClause);
    1226     } else if (!all) {
     1234    } else if (!all && !where2) {
    12271235        psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
    12281236        return false;
    … …  
    12301238    psFree(where);
    12311239
    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");
     1240    if (where2) {
     1241        psStringAppend(&query, where2);
    12451242    }
    12461243

  • trunk/ippTools/src/warptoolConfig.c

    r25703 r25775  
    218218    psMetadataAddTime(warpedArgs, PS_LIST_TAIL, "-dateobs_end", 0,      "search for exposures by time (<=)", NULL);
    219219    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);
    223220    psMetadataAddS16(warpedArgs, PS_LIST_TAIL,  "-fault",  0,           "search by fault code", 0);
    224221    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-label",  PS_META_DUPLICATE_OK, "search by warpRun label", NULL);
     222    // add magic related arguments
     223    pxmagicAddArguments(warpedArgs);
     224    // add arguments for spatial search
     225    pxspaceAddArguments(warpedArgs);
    225226
    226227    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-all",  0,             "search without arguments", false);
Note: See TracChangeset for help on using the changeset viewer.