IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25149


Ignore:
Timestamp:
Aug 20, 2009, 11:48:09 AM (17 years ago)
Author:
watersc1
Message:
 
Location:
branches/czw_branch/cleanup/ippTools
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/cleanup/ippTools/share/chiptool_processedimfile.sql

    r25051 r25149  
    99    chipProcessedImfile.path_base,
    1010    chipProcessedImfile.magicked,
     11    chipProcessedImfile.data_state,
    1112    chipRun.state,
    1213    chipRun.workdir,

  • branches/czw_branch/cleanup/ippTools/share/pstamptool_pendingjob.sql

    r18561 r25149  
    1 SELECT
    2  *
     1SELECT *
    32 FROM pstampJob
    43 WHERE state = 'run'
     4    AND fault = 0

  • branches/czw_branch/cleanup/ippTools/src/dettoolConfig.c

    r24951 r25149  
    7070    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_min",  0,            "define min solar angle", NAN);
    7171    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_max",  0,            "define max solar angle", NAN);
     72
    7273
    7374    psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-registered",  0,            "time detrend run was registered", now);
    … …  
    138139    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment",                0,          "search by comment field (LIKE comparison)", NULL);
    139140
     141
     142    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_angle_min",  0,          "define min moon angle", NAN);
     143    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_angle_max",  0,          "define max moon angle", NAN);
     144    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_alt_min",  0,            "define min moon alt", NAN);
     145    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_alt_max",  0,            "define max moon alt", NAN);
     146    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_min",  0,          "define min moon phase", NAN);
     147    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_max",  0,          "define max moon phase", NAN);
     148    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment",                0,          "search by comment field (LIKE comparison)", NULL);
     149
    140150    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,            "print the exposures that would be included in the detrend run and exit", false);
    141151    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",  0,            "define reduction class for processing", NULL);

  • branches/czw_branch/cleanup/ippTools/src/pstamptool.c

    r25051 r25149  
    315315    PS_ASSERT_PTR_NON_NULL(config, false);
    316316
    317     PXOPT_LOOKUP_S64(req_id,  config->args, "-req_id", true, false);
     317    psMetadata *where = psMetadataAlloc();
     318    PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
     319    PXOPT_COPY_STR(config->args, where, "-name", "name", "==");
     320
    318321    PXOPT_LOOKUP_U64(limit,   config->args, "-limit",  false, false);
    319322    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    320323
    321     psString query = NULL;
    322     psStringAppend(&query, "SELECT * from pstampRequest WHERE req_id = %" PRId64, req_id);
     324    if (!psListLength(where->list)) {
     325        psError(PS_ERR_UNKNOWN, true, "-req_id or -name must be supplied");
     326        return false;
     327    }
     328
     329    psString query = psStringCopy("SELECT * from pstampRequest");
     330
     331    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
     332    psStringAppend(&query, " WHERE %s", whereClause);
     333    psFree(whereClause);
     334    psFree(where);
    323335   
    324336    // treat limit == 0 as "no limit"
    … …  
    342354    }
    343355    if (!psArrayLength(output)) {
    344         psTrace("pstamptool", PS_LOG_INFO, "no rows found");
    345         psFree(output);
    346         return true;
     356        psTrace("pstamptool", PS_LOG_INFO, "request not found");
     357        // This causes main to exit with PS_EXIT_DATA_ERROR which the script is looking for
     358        psError(PXTOOLS_ERR_DATA, true, "request not found");
     359        psFree(output);
     360        // we return false so that the caller can determine that a request does not exist
     361        return false;
    347362    }
    348363
    … …  
    496511{
    497512    bool    stampJob = false;
    498     char   *query = NULL;
    499513
    500514    PS_ASSERT_PTR_NON_NULL(config, false);
    … …  
    503517    PXOPT_LOOKUP_STR(rownum,      config->args, "-rownum",     true, false);
    504518    PXOPT_LOOKUP_STR(job_type,    config->args, "-job_type",   false, false);
    505     PXOPT_LOOKUP_STR(outputBase,  config->args, "-outputBase", true,  false);
     519    PXOPT_LOOKUP_STR(outputBase,  config->args, "-outputBase", false,  false);
    506520    PXOPT_LOOKUP_STR(stateString, config->args, "-state",      false, false);
    507     PXOPT_LOOKUP_STR(fault,       config->args, "-fault",      false, false);
     521    PXOPT_LOOKUP_S16(fault,       config->args, "-fault",      false, false);
    508522    PXOPT_LOOKUP_S64(exp_id,      config->args, "-exp_id",     false, false);
    509523
     524    // unless the job is being inserted with stop state require outputBase
     525    if (strcmp(stateString, "stop") && !outputBase) {
     526        psError(PS_ERR_UNKNOWN, true, "-outputBase is required");
     527        return false;
     528    }
     529
    510530    // default value for job_type is defined in pstamptoolConfig.c
    511     if (!strcmp(job_type, "get_image") || !strcmp(job_type, "detect_query")) {
     531    if (!strcmp(job_type, "get_image") || !strcmp(job_type, "detect_query") || !strcmp(job_type, "none")) {
    512532        stampJob = false;
    513533    } else if (!strcmp(job_type, "stamp")) {
    … …  
    517537        return false;
    518538    }
    519     if (stampJob) {
    520         query = pxDataGet("pstamptool_addjob_stampjob.sql");
    521     } else {
    522         query = pxDataGet("pstamptool_addjob_otherjob.sql");
    523     }
    524     if (!query) {
    525         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    526         return false;
    527     }
    528 
    529     if (!p_psDBRunQueryF(config->dbh, query, req_id, rownum, stateString, job_type, exp_id, outputBase, fault)) {
     539    if (!pstampJobInsert(config->dbh,
     540            0, // job_id
     541            req_id,
     542            rownum,
     543            stateString,
     544            job_type,
     545            fault,
     546            exp_id,
     547            outputBase
     548            )) {
    530549        psError(PS_ERR_UNKNOWN, false, "database error");
    531550        return false;

  • branches/czw_branch/cleanup/ippTools/src/pubtool.c

    r24512 r25149  
    332332    psFree(query);
    333333
    334     return true;
    335 }
    336 
     334    psLogMsg("pubtool", PS_LOG_INFO, "Deleted %" PRIu64 " rows", psDBAffectedRows(config->dbh));
     335
     336    return true;
     337}
     338

  • branches/czw_branch/cleanup/ippTools/src/pxchip.c

    r24951 r25149  
    6969    psMetadataAddF64(md,  PS_LIST_TAIL, "-posang_min",         0, "search by min rotator position angle", NAN);
    7070    psMetadataAddF64(md,  PS_LIST_TAIL, "-posang_max",         0, "search by max rotator position angle", NAN);
     71<<<<<<< .mine
     72=======
    7173    psMetadataAddF32(md,  PS_LIST_TAIL, "-sun_angle_min",         0, "search by min solar angle", NAN);
    7274    psMetadataAddF32(md,  PS_LIST_TAIL, "-sun_angle_max",         0, "search by max solar angle", NAN);
     75    psMetadataAddStr(md,  PS_LIST_TAIL, "-object",             0, "search by exposure object", NULL);
     76>>>>>>> .r25099
    7377    psMetadataAddStr(md,  PS_LIST_TAIL, "-object",             0, "search by exposure object", NULL);
    7478    psMetadataAddStr(md,  PS_LIST_TAIL, "-comment",            0, "search by comment field (LIKE comparison)", NULL);

  • branches/czw_branch/cleanup/ippTools/src/regtool.c

    r24951 r25149  
    331331    PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false);
    332332    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     333    PXOPT_LOOKUP_BOOL(ordered_by_date, config->args, "-ordered_by_date", false);
    333334
    334335    psString query = pxDataGet("regtool_processedimfile.sql");
    … …  
    352353        // don't list faulted rows
    353354        psStringAppend(&query, " %s", "AND rawImfile.fault = 0");
     355    }
     356
     357    // add the ORDER BY statement if desired
     358    if (ordered_by_date) {
     359        psStringAppend(&query, " ORDER BY dateobs");
    354360    }
    355361
    … …  
    923929    PXOPT_COPY_F64(config->args,   where,  "-posang_max", "posang", "<");
    924930    PXOPT_COPY_STR(config->args,   where,  "-object", "object", "==");
    925     PXOPT_COPY_F32(config->args,   where,  "-sun_angle_min", "sun_angle", ">=");
    926     PXOPT_COPY_F32(config->args,   where,  "-sun_angle_max", "sun_angle", "<");
     931    PXOPT_COPY_F32(config->args,   where,  "-solang_min", "solang", ">=");
     932    PXOPT_COPY_F32(config->args,   where,  "-solang_max", "solang", "<");
    927933
    928934    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);

  • branches/czw_branch/cleanup/ippTools/src/warptool.c

    r25051 r25149  
    236236    PXOPT_COPY_F64(config->args,   where, "-posang_max",         "rawExp.posang",         "<");
    237237    PXOPT_COPY_STR(config->args,   where, "-object",             "rawExp.object",         "==");
    238     PXOPT_COPY_F32(config->args,   where, "-sun_angle_min",      "rawExp.sun_angle",      ">=");
    239     PXOPT_COPY_F32(config->args,   where, "-sun_angle_max",      "rawExp.sun_angle",      "<");
     238    PXOPT_COPY_F32(config->args,   where, "-solang_min",         "rawExp.solang",         ">=");
     239    PXOPT_COPY_F32(config->args,   where, "-solang_max",         "rawExp.solang",         "<");
    240240    PXOPT_COPY_STR(config->args,   where, "-reduction",          "fakeRun.reduction",     "==");
    241241    pxAddLabelSearchArgs (config,  where, "-label",             "fakeRun.label",         "==");
Note: See TracChangeset for help on using the changeset viewer.