IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 18154


Ignore:
Timestamp:
Jun 16, 2008, 3:58:22 PM (18 years ago)
Author:
jhoblitt
Message:

rename chiptool -pendingcleanup -> -pendingcleanuprun
add chiptool -pendingcleanupimfile

Location:
branches/cleanup/ippTools
Files:
2 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • branches/cleanup/ippTools/share/Makefile.am

    r18076 r18154  
    1111        chiptool_find_rawexp.sql \
    1212        chiptool_find_unprocessed_imfile.pl \
    13         chiptool_pendingcleanup.sql \
     13        chiptool_pendingcleanuprun.sql \
     14        chiptool_pendingcleanupimfile.sql \
    1415        chiptool_pendingimfile.sql \
    1516        chiptool_processedimfile.sql \

  • branches/cleanup/ippTools/src/chiptool.c

    r18153 r18154  
    4545static bool unmaskedMode(pxConfig *config);
    4646static bool unblockMode(pxConfig *config);
    47 static bool pendingcleanupMode(pxConfig *config);
     47static bool pendingcleanuprunMode(pxConfig *config);
     48static bool pendingcleanupimfileMode(pxConfig *config);
    4849static bool donecleanupMode(pxConfig *config);
    4950static bool runMode(pxConfig *config);
    … …  
    6869
    6970    switch (config->mode) {
    70         MODECASE(CHIPTOOL_MODE_DEFINEBYQUERY,                   definebyqueryMode);
     71        MODECASE(CHIPTOOL_MODE_DEFINEBYQUERY,           definebyqueryMode);
    7172        MODECASE(CHIPTOOL_MODE_UPDATERUN,               updaterunMode);
    7273        MODECASE(CHIPTOOL_MODE_PENDINGIMFILE,           pendingimfileMode);
    … …  
    7980        MODECASE(CHIPTOOL_MODE_UNMASKED,                unmaskedMode);
    8081        MODECASE(CHIPTOOL_MODE_UNBLOCK,                 unblockMode);
    81         MODECASE(CHIPTOOL_MODE_PENDINGCLEANUP,          pendingcleanupMode);
     82        MODECASE(CHIPTOOL_MODE_PENDINGCLEANUPRUN,       pendingcleanuprunMode);
     83        MODECASE(CHIPTOOL_MODE_PENDINGCLEANUPIMFILE,    pendingcleanupimfileMode);
    8284        MODECASE(CHIPTOOL_MODE_DONECLEANUP,             donecleanupMode);
    8385        MODECASE(CHIPTOOL_MODE_RUN,                     runMode);
    … …  
    942944
    943945
    944 static bool pendingcleanupMode(pxConfig *config)
     946static bool pendingcleanuprunMode(pxConfig *config)
    945947{
    946948    PS_ASSERT_PTR_NON_NULL(config, NULL);
    … …  
    952954    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
    953955
    954     psString query = pxDataGet("chiptool_pendingcleanup.sql");
     956    psString query = pxDataGet("chiptool_pendingcleanuprun.sql");
    955957    if (!query) {
    956958        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    … …  
    997999
    9981000    // negative simple so the default is true
    999     if (!ippdbPrintMetadatas(stdout, output, "chipPendingCleanup", !simple)) {
     1001    if (!ippdbPrintMetadatas(stdout, output, "chipPendingCleanupRun", !simple)) {
     1002        psError(PS_ERR_UNKNOWN, false, "failed to print array");
     1003        psFree(output);
     1004        return false;
     1005    }
     1006
     1007    psFree(output);
     1008
     1009    return true;
     1010}
     1011
     1012
     1013static bool pendingcleanupimfileMode(pxConfig *config)
     1014{
     1015    PS_ASSERT_PTR_NON_NULL(config, NULL);
     1016
     1017    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
     1018    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     1019    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     1020
     1021    psMetadata *where = psMetadataAlloc();
     1022    if (chip_id) {
     1023        PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "==");
     1024    }
     1025    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     1026
     1027    psString query = pxDataGet("chiptool_pendingcleanupimfile.sql");
     1028    if (!query) {
     1029        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1030        return false;
     1031    }
     1032
     1033    if (where && psListLength(where->list)) {
     1034        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
     1035        psStringAppend(&query, " AND %s", whereClause);
     1036        psFree(whereClause);
     1037    }
     1038    psFree(where);
     1039
     1040    // treat limit == 0 as "no limit"
     1041    if (limit) {
     1042        psString limitString = psDBGenerateLimitSQL(limit);
     1043        psStringAppend(&query, " %s", limitString);
     1044        psFree(limitString);
     1045    }
     1046
     1047    if (!p_psDBRunQuery(config->dbh, query)) {
     1048        psError(PS_ERR_UNKNOWN, false, "database error");
     1049        psFree(query);
     1050        return false;
     1051    }
     1052    psFree(query);
     1053
     1054    psArray *output = p_psDBFetchResult(config->dbh);
     1055    if (!output) {
     1056        psError(PS_ERR_UNKNOWN, false, "database error");
     1057        return false;
     1058    }
     1059    if (!psArrayLength(output)) {
     1060        psTrace("chiptool", PS_LOG_INFO, "no rows found");
     1061        psFree(output);
     1062        return true;
     1063    }
     1064
     1065    if (!convertIdToStr(output)) {
     1066        psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
     1067        psFree(output);
     1068        return false;
     1069    }
     1070
     1071    // negative simple so the default is true
     1072    if (!ippdbPrintMetadatas(stdout, output, "chipPendingCleanupImfile", !simple)) {
    10001073        psError(PS_ERR_UNKNOWN, false, "failed to print array");
    10011074        psFree(output);

  • branches/cleanup/ippTools/src/chiptool.h

    r18153 r18154  
    3737    CHIPTOOL_MODE_UNBLOCK,
    3838    CHIPTOOL_MODE_RETRYPROCESSEDIMFILE,
    39     CHIPTOOL_MODE_PENDINGCLEANUP,
     39    CHIPTOOL_MODE_PENDINGCLEANUPRUN,
     40    CHIPTOOL_MODE_PENDINGCLEANUPIMFILE,
    4041    CHIPTOOL_MODE_DONECLEANUP,
    4142    CHIPTOOL_MODE_RUN

  • branches/cleanup/ippTools/src/chiptoolConfig.c

    r18153 r18154  
    4545
    4646    // -definebyquery
    47     psMetadata *queueArgs = psMetadataAlloc();
     47    psMetadata *definebyqueryArgs = psMetadataAlloc();
    4848    // XXX need to allow multiple exp_ids
    49     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", NULL);
    50     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);
    51     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst",  0,            "search for camera", NULL);
    52     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope",  0,            "search for telescope", NULL);
    53     psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_begin", 0,            "search for exposures by time (>=)", NULL);
    54     psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0,            "search for exposures by time (<)", NULL);
    55     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag",  0,            "search by exp_tag", NULL);
    56     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exp_type", "object");
    57     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel",  0,            "search by filelevel", NULL);
    58     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-reduction",  0,            "search by reduction class", NULL);
    59     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter",  0,            "search for filter", NULL);
    60     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min",  0,            "define min airmass", NAN);
    61     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max",  0,            "define max airmass", NAN);
    62     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min",  0,            "define min", NAN);
    63     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max",  0,            "define max", NAN);
    64     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min",  0,            "define min", NAN);
    65     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max",  0,            "define max", NAN);
    66     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min",  0,            "define min", NAN);
    67     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max",  0,            "define max", NAN);
    68     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,            "define max fraction of saturated pixels", NAN);
    69     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,            "define min fraction of saturated pixels", NAN);
    70     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_min",  0,            "define max", NAN);
    71     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_max",  0,            "define max", NAN);
    72     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,            "define max", NAN);
    73     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,            "define max", NAN);
    74     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,            "define max", NAN);
    75     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,            "define max", NAN);
    76     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_min",  0,            "define min", NAN);
    77     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_max",  0,            "define max", NAN);
    78     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_min",  0,            "define min", NAN);
    79     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_max",  0,            "define max", NAN);
    80     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,            "define min ccd tempature", NAN);
    81     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,            "define max ccd tempature", NAN);
    82     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_min",  0,            "define min rotator position angle", NAN);
    83     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max",  0,            "define max rotator position angle", NAN);
    84     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object",  0,            "search by exposure object", NULL);
    85     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min",  0,            "define min solar angle", NAN);
    86     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max",  0,            "define max solar angle", NAN);
    87     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir",  0,            "define workdir", NULL);
    88     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label",  0,            "define label", NULL);
    89     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_reduction",  0,            "define reduction class", NULL);
    90     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup",  0,            "define exposure group", NULL);
    91     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb",  0,            "define DVO db", NULL);
    92     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_tess_id",  0,            "define tessellation identifier", NULL);
    93     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_end_stage",  0,            "define end stage", NULL);
    94     psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-pretend",  0,            "do not actually modify the database", false);
    95     psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
     49    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", NULL);
     50    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);
     51    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst",  0,            "search for camera", NULL);
     52    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope",  0,            "search for telescope", NULL);
     53    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0,            "search for exposures by time (>=)", NULL);
     54    psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0,            "search for exposures by time (<)", NULL);
     55    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_tag",  0,            "search by exp_tag", NULL);
     56    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exp_type", "object");
     57    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel",  0,            "search by filelevel", NULL);
     58    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",  0,            "search by reduction class", NULL);
     59    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter",  0,            "search for filter", NULL);
     60    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min",  0,            "define min airmass", NAN);
     61    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max",  0,            "define max airmass", NAN);
     62    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_min",  0,            "define min", NAN);
     63    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_max",  0,            "define max", NAN);
     64    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_min",  0,            "define min", NAN);
     65    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_max",  0,            "define max", NAN);
     66    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min",  0,            "define min", NAN);
     67    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max",  0,            "define max", NAN);
     68    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,            "define max fraction of saturated pixels", NAN);
     69    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,            "define min fraction of saturated pixels", NAN);
     70    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_min",  0,            "define max", NAN);
     71    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_max",  0,            "define max", NAN);
     72    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,            "define max", NAN);
     73    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,            "define max", NAN);
     74    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,            "define max", NAN);
     75    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,            "define max", NAN);
     76    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_min",  0,            "define min", NAN);
     77    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_max",  0,            "define max", NAN);
     78    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_min",  0,            "define min", NAN);
     79    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_max",  0,            "define max", NAN);
     80    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,            "define min ccd tempature", NAN);
     81    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,            "define max ccd tempature", NAN);
     82    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min",  0,            "define min rotator position angle", NAN);
     83    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max",  0,            "define max rotator position angle", NAN);
     84    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-object",  0,            "search by exposure object", NULL);
     85    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_min",  0,            "define min solar angle", NAN);
     86    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_max",  0,            "define max solar angle", NAN);
     87    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",  0,            "define workdir", NULL);
     88    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,            "define label", NULL);
     89    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction",  0,            "define reduction class", NULL);
     90    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_expgroup",  0,            "define exposure group", NULL);
     91    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb",  0,            "define DVO db", NULL);
     92    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_tess_id",  0,            "define tessellation identifier", NULL);
     93    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_end_stage",  0,            "define end stage", NULL);
     94    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,            "do not actually modify the database", false);
     95    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
    9696
    9797
    … …  
    271271    psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,            "name of a label to unmask (required)", NULL);
    272272
    273     // -pendingcleanup
    274     psMetadata *pendingcleanupArgs = psMetadataAlloc();
    275     psMetadataAddStr(pendingcleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
    276     psMetadataAddBool(pendingcleanupArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    277     psMetadataAddU64(pendingcleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     273    // -pendingcleanuprun
     274    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
     275    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     276    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     277    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     278
     279    // -pendingcleanupifmile
     280    psMetadata *pendingcleanupimfileArgs = psMetadataAlloc();
     281    psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     282    psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-chip_id", 0,
     283        "search by chip ID", 0);
     284    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_id",                 0,            "search by exp_id", NULL);
     285    psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     286    psMetadataAddU64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    278287
    279288    // -doneclenaup
    … …  
    293302    psMetadata *modes = psMetadataAlloc();
    294303
    295     PXOPT_ADD_MODE("-definebyquery",                "create runs from raw exposures",
    296         CHIPTOOL_MODE_DEFINEBYQUERY,                queueArgs);
     304    PXOPT_ADD_MODE("-definebyquery",        "create runs from raw exposures",
     305        CHIPTOOL_MODE_DEFINEBYQUERY,        definebyqueryArgs);
    297306    PXOPT_ADD_MODE("-updaterun",            "change chip run properties",
    298307        CHIPTOOL_MODE_UPDATERUN,            updaterunArgs);
    … …  
    315324    PXOPT_ADD_MODE("-unblock",              "remove a label block",
    316325        CHIPTOOL_MODE_UNBLOCK,              unblockArgs);
    317     PXOPT_ADD_MODE("-pendingcleanup",       "show runs that need to be cleaned up",
    318         CHIPTOOL_MODE_PENDINGCLEANUP,       pendingcleanupArgs);
     326    PXOPT_ADD_MODE("-pendingcleanuprun",    "show runs that need to be cleaned up",
     327        CHIPTOOL_MODE_PENDINGCLEANUPRUN,    pendingcleanuprunArgs);
     328    PXOPT_ADD_MODE("-pendingcleanupimfile", "show runs that need to be cleaned up",
     329        CHIPTOOL_MODE_PENDINGCLEANUPIMFILE, pendingcleanupimfileArgs);
    319330    PXOPT_ADD_MODE("-donecleanup",          "show runs that have been cleaned",
    320331        CHIPTOOL_MODE_DONECLEANUP,          donecleanupArgs);
Note: See TracChangeset for help on using the changeset viewer.