IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 18942


Ignore:
Timestamp:
Aug 6, 2008, 10:24:54 AM (18 years ago)
Author:
eugene
Message:

finish coding of cleanup steps for cam, fake, warp, diff, stack

Location:
branches/eam_branch_20080719/ippTools
Files:
6 added
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20080719/ippTools/share/camtool_pendingcleanupexp.sql

    r18645 r18942  
    11SELECT
    2     chipProcessedImfile.*,
    3     chipRun.state,
    4     chipRun.workdir,
    5     chipRun.label,
    6     chipRun.reduction,
    7     chipRun.expgroup,
    8     chipRun.dvodb,
    9     chipRun.tess_id,
    10     chipRun.end_stage
    11 FROM chipRun
    12 JOIN chipProcessedImfile
    13     USING(chip_id)
     2    camProcessedExp.*,
     3    camRun.state,
     4    camRun.workdir,
     5    camRun.label,
     6    camRun.reduction,
     7    camRun.expgroup,
     8    camRun.dvodb,
     9    camRun.tess_id,
     10    camRun.end_stage
     11FROM camRun
     12JOIN camProcessedExp
     13    USING(cam_id)
    1414WHERE
    15     chipRun.state = 'goto_cleaned'
     15    camRun.state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/share/difftool_pendingcleanupskyfile.sql

    r18645 r18942  
    11SELECT
    2     chipProcessedImfile.*,
    3     chipRun.state,
    4     chipRun.workdir,
    5     chipRun.label,
    6     chipRun.reduction,
    7     chipRun.expgroup,
    8     chipRun.dvodb,
    9     chipRun.tess_id,
    10     chipRun.end_stage
    11 FROM chipRun
    12 JOIN chipProcessedImfile
    13     USING(chip_id)
     2    diffSkyfile.*,
     3    diffRun.state,
     4    diffRun.workdir,
     5    diffRun.dvodb,
     6    diffRun.tess_id,
     7FROM diffRun
     8JOIN diffSkyfile
     9    USING(diff_id)
    1410WHERE
    15     chipRun.state = 'goto_cleaned'
     11    diffRun.state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/share/faketool_pendingcleanupimfile.sql

    r18645 r18942  
    11SELECT
    2     chipProcessedImfile.*,
    3     chipRun.state,
    4     chipRun.workdir,
    5     chipRun.label,
    6     chipRun.reduction,
    7     chipRun.expgroup,
    8     chipRun.dvodb,
    9     chipRun.tess_id,
    10     chipRun.end_stage
    11 FROM chipRun
    12 JOIN chipProcessedImfile
    13     USING(chip_id)
     2    fakeProcessedImfile.*,
     3    fakeRun.state,
     4    fakeRun.workdir,
     5    fakeRun.label,
     6    fakeRun.reduction,
     7    fakeRun.expgroup,
     8    fakeRun.dvodb,
     9    fakeRun.tess_id,
     10    fakeRun.end_stage
     11FROM fakeRun
     12JOIN fakeProcessedImfile
     13    USING(fake_id)
    1414WHERE
    15     chipRun.state = 'goto_cleaned'
     15    fakeRun.state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/share/stacktool_pendingcleanupskyfile.sql

    r18645 r18942  
    11SELECT
    2     chipProcessedImfile.*,
    3     chipRun.state,
    4     chipRun.workdir,
    5     chipRun.label,
    6     chipRun.reduction,
    7     chipRun.expgroup,
    8     chipRun.dvodb,
    9     chipRun.tess_id,
    10     chipRun.end_stage
    11 FROM chipRun
    12 JOIN chipProcessedImfile
    13     USING(chip_id)
     2    stackSumSkyfile.*,
     3    stackRun.state,
     4    stackRun.workdir,
     5    stackRun.dvodb,
     6    stackRun.tess_id,
     7FROM stackRun
     8JOIN stackSumSkyfile
     9    USING(stack_id)
    1410WHERE
    15     chipRun.state = 'goto_cleaned'
     11    stackRun.state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/src/camtoolConfig.c

    r18561 r18942  
    274274    psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,            "name of a label to unmask (required)", NULL);
    275275
     276    // -pendingcleanuprun
     277    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
     278    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     279    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     280    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     281
     282    // -pendingcleanupexp
     283    psMetadata *pendingcleanupexpArgs = psMetadataAlloc();
     284    psMetadataAddStr(pendingcleanupexpArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     285    psMetadataAddS64(pendingcleanupexpArgs, PS_LIST_TAIL, "-cam_id", 0,            "search by camera ID", 0);
     286    psMetadataAddStr(pendingcleanupexpArgs, PS_LIST_TAIL, "-exp_id",                 0,            "search by exp_id", NULL);
     287    psMetadataAddBool(pendingcleanupexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     288    psMetadataAddU64(pendingcleanupexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     289
     290    // -donecleanup
     291    psMetadata *donecleanupArgs = psMetadataAlloc();
     292    psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     293    psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     294    psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     295
    276296    psMetadata *argSets = psMetadataAlloc();
    277297    psMetadata *modes = psMetadataAlloc();
    278298
    279     PXOPT_ADD_MODE("-definebyquery",       "", CAMTOOL_MODE_DEFINEBYQUERY, definebydefinebyqueryArgs);
    280     PXOPT_ADD_MODE("-updaterun",           "", CAMTOOL_MODE_UPDATERUN,      updaterunArgs);
    281     PXOPT_ADD_MODE("-pendingexp",          "", CAMTOOL_MODE_PENDINGEXP,    pendingexpArgs);
    282     PXOPT_ADD_MODE("-pendingimfile",       "", CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
    283     PXOPT_ADD_MODE("-addprocessedexp",     "", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
    284     PXOPT_ADD_MODE("-processedexp",        "", CAMTOOL_MODE_PROCESSEDEXP,  processedexpArgs);
    285     PXOPT_ADD_MODE("-revertprocessedexp",  "", CAMTOOL_MODE_REVERTPROCESSEDEXP,  revertprocessedexpArgs);
    286     PXOPT_ADD_MODE("-updateprocessedexp",  "", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
    287     PXOPT_ADD_MODE("-block",               "", CAMTOOL_MODE_BLOCK,         blockArgs);
    288     PXOPT_ADD_MODE("-masked",              "", CAMTOOL_MODE_MASKED,        maskedArgs);
    289     PXOPT_ADD_MODE("-unblock",             "", CAMTOOL_MODE_UNBLOCK,       unblockArgs);
     299    PXOPT_ADD_MODE("-definebyquery",        "create runs from chip stage",          CAMTOOL_MODE_DEFINEBYQUERY, definebydefinebyqueryArgs);
     300    PXOPT_ADD_MODE("-updaterun",            "change cam run properties",            CAMTOOL_MODE_UPDATERUN,      updaterunArgs);
     301    PXOPT_ADD_MODE("-pendingexp",           "show pending exposures",               CAMTOOL_MODE_PENDINGEXP,    pendingexpArgs);
     302    PXOPT_ADD_MODE("-pendingimfile",        "show pending imfiles",                 CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
     303    PXOPT_ADD_MODE("-addprocessedexp",      "add a processed exposure",             CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
     304    PXOPT_ADD_MODE("-processedexp",         "show processed exposures",             CAMTOOL_MODE_PROCESSEDEXP,  processedexpArgs);
     305    PXOPT_ADD_MODE("-revertprocessedexp",   "change procesed exp properties",       CAMTOOL_MODE_REVERTPROCESSEDEXP,  revertprocessedexpArgs);
     306    PXOPT_ADD_MODE("-updateprocessedexp",   "undo a processed exposure",            CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
     307    PXOPT_ADD_MODE("-block",                "set a label block",                    CAMTOOL_MODE_BLOCK,         blockArgs);
     308    PXOPT_ADD_MODE("-masked",               "show blocked labels",                  CAMTOOL_MODE_MASKED,        maskedArgs);
     309    PXOPT_ADD_MODE("-unblock",              "remove a label block",                 CAMTOOL_MODE_UNBLOCK,       unblockArgs);
     310    PXOPT_ADD_MODE("-pendingcleanuprun",    "show runs that need to be cleaned up", CAMTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunArgs);
     311    PXOPT_ADD_MODE("-pendingcleanupexp",    "show exposures for cleanup runs",      CAMTOOL_MODE_PENDINGCLEANUPEXP, pendingcleanupexpArgs);
     312    PXOPT_ADD_MODE("-donecleanup",          "show runs that have been cleaned",     CAMTOOL_MODE_DONECLEANUP,       donecleanupArgs);
    290313
    291314    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {

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

    r18561 r18942  
    279279    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    280280
    281     // -pendingcleanupifmile
     281    // -pendingcleanupimfile
    282282    psMetadata *pendingcleanupimfileArgs = psMetadataAlloc();
    283283    psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
    284     psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-chip_id", 0,
    285         "search by chip ID", 0);
     284    psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-chip_id", 0,          "search by chip ID", 0);
    286285    psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-exp_id",                 0,            "search by exp_id", NULL);
    287286    psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    288287    psMetadataAddU64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    289288
    290     // -doneclenaup
     289    // -donecleanup
    291290    psMetadata *donecleanupArgs = psMetadataAlloc();
    292291    psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);

  • branches/eam_branch_20080719/ippTools/src/difftoolConfig.c

    r18922 r18942  
    138138    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
    139139
     140    // -pendingcleanuprun
     141    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
     142    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     143    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     144    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     145
     146    // -pendingcleanupskyfile
     147    psMetadata *pendingcleanupskyfileArgs = psMetadataAlloc();
     148    psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     149    psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,          "search by diff ID", 0);
     150    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     151    psMetadataAddU64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     152
     153    // -donecleanup
     154    psMetadata *donecleanupArgs = psMetadataAlloc();
     155    psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     156    psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     157    psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     158
    140159    psFree(now);
    141160
    … …  
    153172    PXOPT_ADD_MODE("-definepoprun",     "", DIFFTOOL_MODE_DEFINEPOPRUN,      definepoprunArgs);
    154173    PXOPT_ADD_MODE("-definebyquery",    "", DIFFTOOL_MODE_DEFINEBYQUERY,     definebyqueryArgs);
     174    PXOPT_ADD_MODE("-pendingcleanuprun",     "show runs that need to be cleaned up", DIFFTOOL_MODE_PENDINGCLEANUPRUN,    pendingcleanuprunArgs);
     175    PXOPT_ADD_MODE("-pendingcleanupskyfile", "show runs that need to be cleaned up", DIFFTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileArgs);
     176    PXOPT_ADD_MODE("-donecleanup",           "show runs that have been cleaned",     DIFFTOOL_MODE_DONECLEANUP,          donecleanupArgs);
    155177
    156178    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {

  • branches/eam_branch_20080719/ippTools/src/faketoolConfig.c

    r18923 r18942  
    4747    psMetadata *queueArgs = psMetadataAlloc();
    4848    // XXX need to allow multiple exp_ids
    49     psMetadataAddS64(queueArgs, PS_LIST_TAIL, "-exp_id",  0,
    50             "search by exp_id", 0);
    51     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_name",  0,
    52             "search by exp_name", NULL);
    53     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst",  0,
    54             "search for camera", NULL);
    55     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope",  0,
    56             "search for telescope", NULL);
    57     psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
    58             "search for exposures by time (>=)", NULL);
    59     psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    60             "search for exposures by time (<)", NULL);
    61     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag",  0,
    62             "search by exp_tag", NULL);
    63     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type",  0,
    64             "search by exp_type", "object");
    65     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel",  0,
    66             "search by filelevel", NULL);
    67     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-reduction",  0,
    68             "search by reduction class", NULL);
    69     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter",  0,
    70             "search for filter", NULL);
    71     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min",  0,
    72             "define min airmass", NAN);
    73     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max",  0,
    74             "define max airmass", NAN);
    75     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min",  0,
    76             "define min", NAN);
    77     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max",  0,
    78             "define max", NAN);
    79     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min",  0,
    80             "define min", NAN);
    81     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max",  0,
    82             "define max", NAN);
    83     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min",  0,
    84             "define min", NAN);
    85     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max",  0,
    86             "define max", NAN);
    87     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
    88             "define max fraction of saturated pixels", NAN);
    89     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
    90             "define min fraction of saturated pixels", NAN);
    91     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_min",  0,
    92             "define max", NAN);
    93     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_max",  0,
    94             "define max", NAN);
    95     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
    96             "define max", NAN);
    97     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
    98             "define max", NAN);
    99     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
    100             "define max", NAN);
    101     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
    102             "define max", NAN);
    103     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_min",  0,
    104             "define min", NAN);
    105     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_max",  0,
    106             "define max", NAN);
    107     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_min",  0,
    108             "define min", NAN);
    109     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_max",  0,
    110             "define max", NAN);
    111     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
    112             "define min ccd tempature", NAN);
    113     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
    114             "define max ccd tempature", NAN);
    115     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_min",  0,
    116             "define min rotator position angle", NAN);
    117     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max",  0,
    118             "define max rotator position angle", NAN);
    119     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object",  0,
    120             "search by exposure object", NULL);
    121     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min",  0,
    122             "define min solar angle", NAN);
    123     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max",  0,
    124             "define max solar angle", NAN);
    125     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir",  0,
    126             "define workdir", NULL);
    127     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label",  0,
    128             "define label", NULL);
    129     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_reduction",  0,
    130             "define reduction class", NULL);
    131     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup",  0,
    132             "define exposure group", NULL);
    133     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb",  0,
    134             "define DVO db", NULL);
    135     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_tess_id",  0,
    136             "define tessellation identifier", NULL);
    137     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_end_stage",  0,
    138             "define end stage", NULL);
    139     psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-pretend",  0,
    140             "do not actually modify the database", false);
    141     psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-all",  0,
    142             "allow everything to be queued without search terms", false);
     49    psMetadataAddS64(queueArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", 0);
     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);
    14396
    14497
    14598    // -updaterun
    14699    psMetadata *updaterunArgs = psMetadataAlloc();
    147     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id", 0,
    148             "search by fake ID", 0);
    149     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id",  0,
    150             "search by exp_id", 0);
    151     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name",  0,
    152             "search by exp_name", NULL);
    153     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst",  0,
    154             "search for camera", NULL);
    155     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope",  0,
    156             "search for telescope", NULL);
    157     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
    158             "search for exposures by time (>=)", NULL);
    159     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    160             "search for exposures by time (<)", NULL);
    161     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag",  0,
    162             "search by exp_tag", NULL);
    163     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type",  0,
    164             "search by exp_type", "object");
    165     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel",  0,
    166             "search by filelevel", NULL);
    167     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction",  0,
    168             "search by reduction class", NULL);
    169     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter",  0,
    170             "search for filter", NULL);
    171     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min",  0,
    172             "define min airmass", NAN);
    173     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max",  0,
    174             "define max airmass", NAN);
    175     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min",  0,
    176             "define min", NAN);
    177     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max",  0,
    178             "define max", NAN);
    179     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min",  0,
    180             "define min", NAN);
    181     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max",  0,
    182             "define max", NAN);
    183     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min",  0,
    184             "define min", NAN);
    185     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max",  0,
    186             "define max", NAN);
    187     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
    188             "define max fraction of saturated pixels", NAN);
    189     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
    190             "define min fraction of saturated pixels", NAN);
    191     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min",  0,
    192             "define max", NAN);
    193     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max",  0,
    194             "define max", NAN);
    195     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
    196             "define max", NAN);
    197     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
    198             "define max", NAN);
    199     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
    200             "define max", NAN);
    201     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
    202             "define max", NAN);
    203     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min",  0,
    204             "define min", NAN);
    205     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max",  0,
    206             "define max", NAN);
    207     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min",  0,
    208             "define min", NAN);
    209     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max",  0,
    210             "define max", NAN);
    211     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
    212             "define min ccd tempature", NAN);
    213     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
    214             "define max ccd tempature", NAN);
    215     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min",  0,
    216             "define min rotator position angle", NAN);
    217     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max",  0,
    218             "define max rotator position angle", NAN);
    219     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object",  0,
    220             "search by exposure object", NULL);
    221     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min",  0,
    222             "define min solar angle", NAN);
    223     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max",  0,
    224             "define max solar angle", NAN);
    225 
    226     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
    227             "set state", NULL);
    228     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0,
    229             "set label", NULL);
    230     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,
    231             "allow everything to be queued without search terms", false);
     100    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id", 0,            "search by fake ID", 0);
     101    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", 0);
     102    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);
     103    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst",  0,            "search for camera", NULL);
     104    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope",  0,            "search for telescope", NULL);
     105    psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,            "search for exposures by time (>=)", NULL);
     106    psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0,            "search for exposures by time (<)", NULL);
     107    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag",  0,            "search by exp_tag", NULL);
     108    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exp_type", "object");
     109    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel",  0,            "search by filelevel", NULL);
     110    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction",  0,            "search by reduction class", NULL);
     111    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter",  0,            "search for filter", NULL);
     112    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min",  0,            "define min airmass", NAN);
     113    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max",  0,            "define max airmass", NAN);
     114    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min",  0,            "define min", NAN);
     115    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max",  0,            "define max", NAN);
     116    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min",  0,            "define min", NAN);
     117    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max",  0,            "define max", NAN);
     118    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min",  0,            "define min", NAN);
     119    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max",  0,            "define max", NAN);
     120    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,            "define max fraction of saturated pixels", NAN);
     121    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,            "define min fraction of saturated pixels", NAN);
     122    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min",  0,            "define max", NAN);
     123    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max",  0,            "define max", NAN);
     124    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,            "define max", NAN);
     125    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,            "define max", NAN);
     126    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,            "define max", NAN);
     127    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,            "define max", NAN);
     128    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min",  0,            "define min", NAN);
     129    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max",  0,            "define max", NAN);
     130    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min",  0,            "define min", NAN);
     131    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max",  0,            "define max", NAN);
     132    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,            "define min ccd tempature", NAN);
     133    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,            "define max ccd tempature", NAN);
     134    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min",  0,            "define min rotator position angle", NAN);
     135    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max",  0,            "define max rotator position angle", NAN);
     136    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object",  0,            "search by exposure object", NULL);
     137    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min",  0,            "define min solar angle", NAN);
     138    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max",  0,            "define max solar angle", NAN);
     139
     140    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,            "set state", NULL);
     141    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0,            "set label", NULL);
     142    psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
    232143
    233144    // -pendingexp
    234145    psMetadata *pendingexpArgs = psMetadataAlloc();
    235     psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-fake_id", 0,
    236             "search by fake ID", 0);
    237     psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0,
    238             "search by camtool ID", 0);
    239     psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0,
    240             "search by chiptool ID", 0);
    241     psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",  0,
    242             "limit result set to N items", 0);
    243     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0,
    244             "use the simple output format", false);
     146    psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-fake_id", 0,            "search by fake ID", 0);
     147    psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0,            "search by camtool ID", 0);
     148    psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0,            "search by chiptool ID", 0);
     149    psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     150    psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    245151
    246152    // -pendingimfile
    247153    psMetadata *pendingimfileArgs = psMetadataAlloc();
    248     psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-fake_id",  0,
    249             "search by fake ID", 0);
    250     psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
    251             "search by exposure ID", 0);
    252     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    253             "search by class ID", NULL);
    254     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst",  0,
    255             "search by camera of interest", NULL);
    256     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter",  0,
    257             "search by filter of interest", NULL);
    258     psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,
    259             "limit result set to N items", 0);
    260     psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple",  0,
    261             "use the simple output format", false);
     154    psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-fake_id",  0,            "search by fake ID", 0);
     155    psMetadataAddS64(pendingimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
     156    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
     157    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst",  0,            "search by camera of interest", NULL);
     158    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter",  0,            "search by filter of interest", NULL);
     159    psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     160    psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    262161
    263162    // -addprocessedimfile
    264163    psMetadata *addprocessedimfileArgs = psMetadataAlloc();
    265     psMetadataAddS64(addprocessedimfileArgs, PS_LIST_TAIL, "-fake_id",  0,
    266             "define fake ID (required)", 0);
    267     psMetadataAddS64(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
    268             "define exposure ID (required)", 0);
    269     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    270             "define class ID (required)", NULL);
    271     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri",  0,
    272             "define URL", NULL);
    273     psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_fake",  0,
    274             "define elapsed time for detrend (seconds)", NAN);
    275     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-hostname",  0,
    276             "define hostname", NULL);
    277     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base",  0,
    278             "define base output location", NULL);
    279     psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
    280             "set fault code", 0);
     164    psMetadataAddS64(addprocessedimfileArgs, PS_LIST_TAIL, "-fake_id",  0,            "define fake ID (required)", 0);
     165    psMetadataAddS64(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "define exposure ID (required)", 0);
     166    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "define class ID (required)", NULL);
     167    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri",  0,            "define URL", NULL);
     168    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-dtime_fake",  0,            "define elapsed time for detrend (seconds)", NAN);
     169    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-hostname",  0,            "define hostname", NULL);
     170    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base",  0,            "define base output location", NULL);
     171    psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,            "set fault code", 0);
    281172
    282173    // -processedimfile
    283174    psMetadata *processedimfileArgs = psMetadataAlloc();
    284     psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-fake_id",  0,
    285             "define fake ID", 0);
    286     psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
    287             "define exposure ID", 0);
    288     psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    289             "define class ID", NULL);
    290     psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-inst",  0,
    291             "define camera of interest", NULL);
    292     psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter",  0,
    293             "define filter of interest", NULL);
    294     psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit",  0,
    295             "limit result set to N items", 0);
    296     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted",  0,
    297             "only return imfiles with a fault status set", false);
    298     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,
    299             "use the simple output format", false);
     175    psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-fake_id",  0,            "define fake ID", 0);
     176    psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "define exposure ID", 0);
     177    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "define class ID", NULL);
     178    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-inst",  0,            "define camera of interest", NULL);
     179    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter",  0,            "define filter of interest", NULL);
     180    psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     181    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted",  0,            "only return imfiles with a fault status set", false);
     182    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    300183
    301184    // -updateprocessedimfile
    302185    psMetadata *updateprocessedimfileArgs = psMetadataAlloc();
    303     psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-fake_id",  0,
    304             "search by fake ID", 0);
    305     psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
    306             "search by exposure ID", 0);
    307     psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    308             "search by class ID", NULL);
    309     psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
    310             "set fault code (required)", 0);
     186    psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-fake_id",  0,            "search by fake ID", 0);
     187    psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
     188    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
     189    psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,            "set fault code (required)", 0);
    311190
    312191    // -revertprocessedimfile
    313192    psMetadata *revertprocessedimfileArgs = psMetadataAlloc();
    314     psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-fake_id", 0,
    315             "search by fake ID", 0);
    316     psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
    317             "search by exp_id", 0);
    318     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_name",  0,
    319             "search by exp_name", NULL);
    320     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-inst",  0,
    321             "search for camera", NULL);
    322     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-telescope",  0,
    323             "search for telescope", NULL);
    324     psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
    325             "search for exposures by time (>=)", NULL);
    326     psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    327             "search for exposures by time (<)", NULL);
    328     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    329             "search by exp_tag", NULL);
    330     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_type",  0,
    331             "search by exp_type", "object");
    332     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filelevel",  0,
    333             "search by filelevel", NULL);
    334     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-reduction",  0,
    335             "search by reduction class", NULL);
    336     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filter",  0,
    337             "search for filter", NULL);
    338     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_min",  0,
    339             "define min airmass", NAN);
    340     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_max",  0,
    341             "define max airmass", NAN);
    342     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_min",  0,
    343             "define min", NAN);
    344     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_max",  0,
    345             "define max", NAN);
    346     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_min",  0,
    347             "define min", NAN);
    348     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_max",  0,
    349             "define max", NAN);
    350     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_min",  0,
    351             "define min", NAN);
    352     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_max",  0,
    353             "define max", NAN);
    354     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
    355             "define max fraction of saturated pixels", NAN);
    356     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
    357             "define min fraction of saturated pixels", NAN);
    358     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_min",  0,
    359             "define max", NAN);
    360     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_max",  0,
    361             "define max", NAN);
    362     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
    363             "define max", NAN);
    364     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
    365             "define max", NAN);
    366     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
    367             "define max", NAN);
    368     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
    369             "define max", NAN);
    370     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_min",  0,
    371             "define min", NAN);
    372     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_max",  0,
    373             "define max", NAN);
    374     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_min",  0,
    375             "define min", NAN);
    376     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_max",  0,
    377             "define max", NAN);
    378     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_min",0,
    379             "define min ccd tempature", NAN);
    380     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_max",0,
    381             "define max ccd tempature", NAN);
    382     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_min",  0,
    383             "define min rotator position angle", NAN);
    384     psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_max",  0,
    385             "define max rotator position angle", NAN);
    386     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-object",  0,
    387             "search by exposure object", NULL);
    388     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_min",  0,
    389             "define min solar angle", NAN);
    390     psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_max",  0,
    391             "define max solar angle", NAN);
    392 
    393     psMetadataAddBool(revertprocessedimfileArgs, PS_LIST_TAIL, "-all",  0,
    394             "allow everything to be queued without search terms", false);
    395     psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
    396             "search by fault code", 0);
     193    psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-fake_id", 0,            "search by fake ID", 0);
     194    psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", 0);
     195    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);
     196    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-inst",  0,            "search for camera", NULL);
     197    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-telescope",  0,            "search for telescope", NULL);
     198    psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_begin", 0,            "search for exposures by time (>=)", NULL);
     199    psMetadataAddTime(revertprocessedimfileArgs, PS_LIST_TAIL, "-dateobs_end", 0,            "search for exposures by time (<)", NULL);
     200    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,            "search by exp_tag", NULL);
     201    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exp_type", "object");
     202    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filelevel",  0,            "search by filelevel", NULL);
     203    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-reduction",  0,            "search by reduction class", NULL);
     204    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-filter",  0,            "search for filter", NULL);
     205    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_min",  0,            "define min airmass", NAN);
     206    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_max",  0,            "define max airmass", NAN);
     207    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_min",  0,            "define min", NAN);
     208    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_max",  0,            "define max", NAN);
     209    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_min",  0,            "define min", NAN);
     210    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_max",  0,            "define max", NAN);
     211    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_min",  0,            "define min", NAN);
     212    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_max",  0,            "define max", NAN);
     213    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,            "define max fraction of saturated pixels", NAN);
     214    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,            "define min fraction of saturated pixels", NAN);
     215    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_min",  0,            "define max", NAN);
     216    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_max",  0,            "define max", NAN);
     217    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,            "define max", NAN);
     218    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,            "define max", NAN);
     219    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,            "define max", NAN);
     220    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,            "define max", NAN);
     221    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_min",  0,            "define min", NAN);
     222    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-alt_max",  0,            "define max", NAN);
     223    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_min",  0,            "define min", NAN);
     224    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-az_max",  0,            "define max", NAN);
     225    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_min",0,            "define min ccd tempature", NAN);
     226    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp_max",0,            "define max ccd tempature", NAN);
     227    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_min",  0,            "define min rotator position angle", NAN);
     228    psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_max",  0,            "define max rotator position angle", NAN);
     229    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-object",  0,            "search by exposure object", NULL);
     230    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_min",  0,            "define min solar angle", NAN);
     231    psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_max",  0,            "define max solar angle", NAN);
     232
     233    psMetadataAddBool(revertprocessedimfileArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
     234    psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,            "search by fault code", 0);
    397235
    398236    // -block
    399237    psMetadata *blockArgs = psMetadataAlloc();
    400     psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label",  0,
    401             "name of a label to mask out (required)", NULL);
     238    psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label",  0,            "name of a label to mask out (required)", NULL);
    402239
    403240    // -masked
    404241    psMetadata *maskedArgs = psMetadataAlloc();
    405     psMetadataAddStr(maskedArgs, PS_LIST_TAIL, "-label",  0,
    406             "list blocks for specified label", NULL);
    407     psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple",  0,
    408             "use the simple output format", false);
    409     psMetadataAddU64(maskedArgs, PS_LIST_TAIL, "-limit",  0,
    410             "limit result set to N items", 0);
     242    psMetadataAddStr(maskedArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     243    psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     244    psMetadataAddU64(maskedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    411245
    412246    // -unmasked
    413247    psMetadata *unmaskedArgs = psMetadataAlloc();
    414     psMetadataAddStr(unmaskedArgs, PS_LIST_TAIL, "-label",  0,
    415             "restrict to specified label", NULL);
    416     psMetadataAddBool(unmaskedArgs, PS_LIST_TAIL, "-simple",  0,
    417             "use the simple output format", false);
    418     psMetadataAddU64(unmaskedArgs, PS_LIST_TAIL, "-limit",  0,
    419             "limit result set to N items", 0);
     248    psMetadataAddStr(unmaskedArgs, PS_LIST_TAIL, "-label",  0,            "restrict to specified label", NULL);
     249    psMetadataAddBool(unmaskedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     250    psMetadataAddU64(unmaskedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    420251
    421252    // -unblock
    422253    psMetadata *unblockArgs = psMetadataAlloc();
    423     psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,
    424             "name of a label to unmask (required)", NULL);
     254    psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,            "name of a label to unmask (required)", NULL);
     255
     256    // -pendingcleanuprun
     257    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
     258    psMetadataAddStr(pendingcleanuprunArgs,  PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     259    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     260    psMetadataAddU64(pendingcleanuprunArgs,  PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     261
     262    // -pendingcleanupimfile
     263    psMetadata *pendingcleanupimfileArgs = psMetadataAlloc();
     264    psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     265    psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-fake_id", 0,          "search by chip ID", 0);
     266    psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     267    psMetadataAddU64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     268
     269    // -donecleanup
     270    psMetadata *donecleanupArgs = psMetadataAlloc();
     271    psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     272    psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     273    psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    425274
    426275    psMetadata *argSets = psMetadataAlloc();
    427276    psMetadata *modes = psMetadataAlloc();
    428277
    429     PXOPT_ADD_MODE("-definebyquery",                 "create runs from raw exposures",
    430         FAKETOOL_MODE_DEFINEBYQUERY,                    queueArgs);
    431     PXOPT_ADD_MODE("-updaterun",             "change fake run properties",
    432         FAKETOOL_MODE_UPDATERUN,                updaterunArgs);
    433     PXOPT_ADD_MODE("-pendingexp",           "show pending exposures",
    434         FAKETOOL_MODE_PENDINGEXP,               pendingexpArgs);
    435     PXOPT_ADD_MODE("-pendingimfile",         "show pending imfiles",
    436         FAKETOOL_MODE_PENDINGIMFILE,            pendingimfileArgs);
    437     PXOPT_ADD_MODE("-addprocessedimfile",    "add a processed imfile",
    438         FAKETOOL_MODE_ADDPROCESSEDIMFILE,       addprocessedimfileArgs);
    439     PXOPT_ADD_MODE("-processedimfile",       "show processed imfiles",
    440         FAKETOOL_MODE_PROCESSEDIMFILE,          processedimfileArgs);
    441     PXOPT_ADD_MODE("-updateprocessedimfile","change procesed imfile properties",        FAKETOOL_MODE_UPDATEPROCESSEDIMFILE,    updateprocessedimfileArgs);
    442     PXOPT_ADD_MODE("-revertprocessedimfile", "undo a processed imfile",
    443         FAKETOOL_MODE_REVERTPROCESSEDIMFILE,    revertprocessedimfileArgs);
    444     PXOPT_ADD_MODE("-block",                 "set a label block", FAKETOOL_MODE_BLOCK,          blockArgs);
    445     PXOPT_ADD_MODE("-masked",                "show blocked labels", FAKETOOL_MODE_MASKED,         maskedArgs);
    446     PXOPT_ADD_MODE("-unmasked",              "", FAKETOOL_MODE_UNMASKED,       unmaskedArgs);
    447     PXOPT_ADD_MODE("-unblock",               "remove a label block", FAKETOOL_MODE_UNBLOCK,        unblockArgs);
     278    PXOPT_ADD_MODE("-definebyquery",         "create runs from raw exposures",       FAKETOOL_MODE_DEFINEBYQUERY,                    queueArgs);
     279    PXOPT_ADD_MODE("-updaterun",             "change fake run properties",           FAKETOOL_MODE_UPDATERUN,                updaterunArgs);
     280    PXOPT_ADD_MODE("-pendingexp",            "show pending exposures",               FAKETOOL_MODE_PENDINGEXP,               pendingexpArgs);
     281    PXOPT_ADD_MODE("-pendingimfile",         "show pending imfiles",                 FAKETOOL_MODE_PENDINGIMFILE,            pendingimfileArgs);
     282    PXOPT_ADD_MODE("-addprocessedimfile",    "add a processed imfile",               FAKETOOL_MODE_ADDPROCESSEDIMFILE,       addprocessedimfileArgs);
     283    PXOPT_ADD_MODE("-processedimfile",       "show processed imfiles",               FAKETOOL_MODE_PROCESSEDIMFILE,          processedimfileArgs);
     284    PXOPT_ADD_MODE("-updateprocessedimfile","change procesed imfile properties",     FAKETOOL_MODE_UPDATEPROCESSEDIMFILE,    updateprocessedimfileArgs);
     285    PXOPT_ADD_MODE("-revertprocessedimfile", "undo a processed imfile",              FAKETOOL_MODE_REVERTPROCESSEDIMFILE,    revertprocessedimfileArgs);
     286    PXOPT_ADD_MODE("-block",                 "set a label block",                    FAKETOOL_MODE_BLOCK,          blockArgs);
     287    PXOPT_ADD_MODE("-masked",                "show blocked labels",                  FAKETOOL_MODE_MASKED,         maskedArgs);
     288    PXOPT_ADD_MODE("-unmasked",              "",                                     FAKETOOL_MODE_UNMASKED,       unmaskedArgs);
     289    PXOPT_ADD_MODE("-unblock",               "remove a label block",                 FAKETOOL_MODE_UNBLOCK,        unblockArgs);
     290    PXOPT_ADD_MODE("-pendingcleanuprun",     "show runs that need to be cleaned up", FAKETOOL_MODE_PENDINGCLEANUPRUN,    pendingcleanuprunArgs);
     291    PXOPT_ADD_MODE("-pendingcleanupimfile",  "show runs that need to be cleaned up", FAKETOOL_MODE_PENDINGCLEANUPIMFILE, pendingcleanupimfileArgs);
     292    PXOPT_ADD_MODE("-donecleanup",           "show runs that have been cleaned",     FAKETOOL_MODE_DONECLEANUP,          donecleanupArgs);
    448293
    449294    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {

  • branches/eam_branch_20080719/ippTools/src/stacktoolConfig.c

    r18578 r18942  
    134134    psMetadataAddS16(revertsumskyfileArgs, PS_LIST_TAIL, "-code",  0,            "search by fault code", 0);
    135135
     136    // -pendingcleanuprun
     137    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
     138    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     139    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     140    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     141
     142    // -pendingcleanupskyfile
     143    psMetadata *pendingcleanupskyfileArgs = psMetadataAlloc();
     144    psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     145    psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,          "search by stack ID", 0);
     146    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     147    psMetadataAddU64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     148
     149    // -donecleanup
     150    psMetadata *donecleanupArgs = psMetadataAlloc();
     151    psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     152    psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     153    psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     154
    136155    psFree(now);
    137156
    … …  
    148167    PXOPT_ADD_MODE("-sumskyfile",      "", STACKTOOL_MODE_SUMSKYFILE,      sumskyfileArgs);
    149168    PXOPT_ADD_MODE("-revertsumskyfile","", STACKTOOL_MODE_REVERTSUMSKYFILE,      revertsumskyfileArgs);
     169    PXOPT_ADD_MODE("-pendingcleanuprun",     "show runs that need to be cleaned up", STACKTOOL_MODE_PENDINGCLEANUPRUN,    pendingcleanuprunArgs);
     170    PXOPT_ADD_MODE("-pendingcleanupskyfile", "show runs that need to be cleaned up", STACKTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileArgs);
     171    PXOPT_ADD_MODE("-donecleanup",           "show runs that have been cleaned",     STACKTOOL_MODE_DONECLEANUP,          donecleanupArgs);
    150172
    151173    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {

  • branches/eam_branch_20080719/ippTools/src/warptool.c

    r18922 r18942  
    8787        MODECASE(WARPTOOL_MODE_UNBLOCK,            unblockMode);
    8888        MODECASE(WARPTOOL_MODE_PENDINGCLEANUPRUN,  pendingcleanuprunMode);
    89         MODECASE(WARPTOOL_MODE_PENDINGCLEANUPWARP, pendingcleanupwarpMode);
     89        MODECASE(WARPTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupwarpMode);
    9090        MODECASE(WARPTOOL_MODE_DONECLEANUP,        donecleanupMode);
    9191
    … …  
    12181218    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
    12191219
    1220     psString query = pxDataGet("warptool_pendingcleanupwarp.sql");
     1220    psString query = pxDataGet("warptool_pendingcleanupskyfile.sql");
    12211221    if (!query) {
    12221222        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");

  • branches/eam_branch_20080719/ippTools/src/warptool.h

    r18642 r18942  
    4242    WARPTOOL_MODE_UNBLOCK,
    4343    WARPTOOL_MODE_PENDINGCLEANUPRUN,
    44     WARPTOOL_MODE_PENDINGCLEANUPWARP,
     44    WARPTOOL_MODE_PENDINGCLEANUPSKYFILE,
    4545    WARPTOOL_MODE_DONECLEANUP,
    4646} warptoolMode;

  • branches/eam_branch_20080719/ippTools/src/warptoolConfig.c

    r18561 r18942  
    251251    psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,            "name of a label to unmask (required)", NULL);
    252252
     253    // -pendingcleanuprun
     254    psMetadata *pendingcleanuprunArgs = psMetadataAlloc();
     255    psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     256    psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     257    psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     258
     259    // -pendingcleanupskyfile
     260    psMetadata *pendingcleanupskyfileArgs = psMetadataAlloc();
     261    psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     262    psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,          "search by warp ID", 0);
     263    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     264    psMetadataAddU64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     265
     266    // -donecleanup
     267    psMetadata *donecleanupArgs = psMetadataAlloc();
     268    psMetadataAddStr(donecleanupArgs, PS_LIST_TAIL, "-label",  0,            "list blocks for specified label", NULL);
     269    psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     270    psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     271
    253272    psFree(now);
    254273    psMetadata *argSets = psMetadataAlloc();
    … …  
    266285    PXOPT_ADD_MODE("-warped",          "", WARPTOOL_MODE_WARPED,         warpedArgs);
    267286    PXOPT_ADD_MODE("-revertwarped",    "", WARPTOOL_MODE_REVERTWARPED,   revertwarpedArgs);
    268     PXOPT_ADD_MODE("-block",           "set a label block", WARPTOOL_MODE_BLOCK,          blockArgs);
    269     PXOPT_ADD_MODE("-masked",          "show blocked lables", WARPTOOL_MODE_MASKED,         maskedArgs);
    270     PXOPT_ADD_MODE("-unblock",         "remove a label block", WARPTOOL_MODE_UNBLOCK,        unblockArgs);
     287    PXOPT_ADD_MODE("-block",                 "set a label block",                    WARPTOOL_MODE_BLOCK,          blockArgs);
     288    PXOPT_ADD_MODE("-masked",                "show blocked lables",                  WARPTOOL_MODE_MASKED,         maskedArgs);
     289    PXOPT_ADD_MODE("-unblock",               "remove a label block",                 WARPTOOL_MODE_UNBLOCK,        unblockArgs);
     290    PXOPT_ADD_MODE("-pendingcleanuprun",     "show runs that need to be cleaned up", WARPTOOL_MODE_PENDINGCLEANUPRUN,    pendingcleanuprunArgs);
     291    PXOPT_ADD_MODE("-pendingcleanupskyfile", "show runs that need to be cleaned up", WARPTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileArgs);
     292    PXOPT_ADD_MODE("-donecleanup",           "show runs that have been cleaned",     WARPTOOL_MODE_DONECLEANUP,          donecleanupArgs);
    271293
    272294    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
Note: See TracChangeset for help on using the changeset viewer.