IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25419 for trunk/ippTools


Ignore:
Timestamp:
Sep 16, 2009, 9:47:16 AM (17 years ago)
Author:
bills
Message:

Change magicdstool -todestreak to query the individual stages separately.
This greatly decreases the query time.
Add support for magicDSRun.state = 'goto_restore' and 'goto_censored' which
will restore destreaked files back to their original state.
Split up ippTasks/magic.pro into magic.pro and destreak.pro so that processing
can be easily magnaged separately

Location:
trunk/ippTools
Files:
6 added
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/Makefile.am

    r25324 r25419  
    165165     magictool_revertnode.sql \
    166166     magicdstool_completed_runs.sql \
     167     magicdstool_completedrevert.sql \
    167168     magicdstool_definebyquery_raw.sql \
    168169     magicdstool_definebyquery_chip.sql \
    … …  
    172173     magicdstool_getrunids.sql \
    173174     magicdstool_getskycells.sql \
    174      magicdstool_todestreak.sql \
     175     magicdstool_todestreak_camera.sql \
     176     magicdstool_todestreak_chip.sql \
     177     magicdstool_todestreak_diff.sql \
     178     magicdstool_todestreak_raw.sql \
     179     magicdstool_todestreak_warp.sql \
    175180     magicdstool_toremove.sql \
    176181     magicdstool_torestore.sql \

  • trunk/ippTools/share/magicdstool_torevert_camera.sql

    r24883 r25419  
    1919    JOIN rawExp using(exp_id)
    2020WHERE magicDSRun.stage = 'camera'
    21     AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
    22     AND magicDSFile.fault > 0
     21    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
     22       OR magicDSRun.state = 'goto_censored'
     23       OR magicDSRun.state = 'goto_restored')

  • trunk/ippTools/share/magicdstool_torevert_chip.sql

    r24883 r25419  
    1818    JOIN rawExp using(exp_id)
    1919WHERE magicDSRun.stage = 'chip'
    20     AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
    21     AND magicDSFile.fault > 0
     20    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
     21       OR magicDSRun.state = 'goto_censored'
     22       OR magicDSRun.state = 'goto_restored')

  • trunk/ippTools/share/magicdstool_torevert_diff.sql

    r24883 r25419  
    1818    JOIN rawExp USING(exp_id)
    1919WHERE magicDSRun.stage = 'diff'
    20     AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
    21     AND magicDSFile.fault > 0
     20    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
     21       OR magicDSRun.state = 'goto_censored'
     22       OR magicDSRun.state = 'goto_restored')

  • trunk/ippTools/share/magicdstool_torevert_raw.sql

    r24883 r25419  
    1818                      AND rawImfile.tmp_class_id = summitImfile.class_id)
    1919WHERE magicDSRun.stage = 'raw'
    20     AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
    21     AND magicDSFile.fault > 0
     20    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
     21       OR magicDSRun.state = 'goto_censored'
     22       OR magicDSRun.state = 'goto_restored')

  • trunk/ippTools/share/magicdstool_torevert_warp.sql

    r24883 r25419  
    2121    JOIN rawExp USING(exp_id)
    2222WHERE magicDSRun.stage = 'warp'
    23     AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
    24     AND magicDSFile.fault > 0
     23    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
     24       OR magicDSRun.state = 'goto_censored'
     25       OR magicDSRun.state = 'goto_restored')

  • trunk/ippTools/share/magictool_censor_chip.sql

    r24883 r25419  
    11UPDATE chipRun
    22    JOIN chipProcessedImfile USING(chip_id, exp_id)
    3     JOIN magicDSRun ON chipRun.magicked = magicDSRun.magic_ds_id
     3    JOIN magicDSRun ON stage_id = chip_id AND stage = 'chip' AND re_place
    44    JOIN magicDSFile USING(magic_ds_id)
    5     JOIN magicRun USING(magic_id, exp_id)
     5    JOIN magicRun using(magic_id)
    66SET chipProcessedImfile.magicked = 0,
    77    chipRun.magicked = 0,

  • trunk/ippTools/share/magictool_censor_diff.sql

    r24883 r25419  
    1 UPDATE magicRun
    2     JOIN magicDSRun USING(magic_id)
     1UPDATE diffRun
     2    JOIN diffSkyfile USING(diff_id)
     3    JOIN magicRun USING(diff_id)
     4    JOIN magicDSRun ON stage = 'diff' AND stage_id = diff_id AND re_place
    35    JOIN magicDSFile USING(magic_ds_id)
    4     JOIN diffRun ON magic_ds_id = magicked
    5     JOIN diffSkyfile ON diffRun.diff_id = diffSkyfile.diff_id
    66SET diffRun.magicked = 0,
    77    diffSkyfile.magicked = 0,

  • trunk/ippTools/share/magictool_censor_raw.sql

    r24885 r25419  
    22    JOIN magicDSRun USING(magic_id)
    33    JOIN magicDSFile USING(magic_ds_id)
    4     JOIN rawExp ON rawExp.magicked = magic_ds_id
    5     JOIN rawImfile ON rawExp.exp_id = rawImfile.exp_id
     4    JOIN rawImfile ON rawImfile.magicked = magic_ds_id
     5--    JOIN rawExp ON rawExp.magicked = magic_ds_id
    66SET rawImfile.magicked = 0,
    7     rawExp.magicked = 0,
    8     magicDSRun.state = 'censored',
     7--    rawExp.magicked = 0,
     8--    magicDSRun.state = 'censored',
    99    magicDSFile.fault = 42
    1010

  • trunk/ippTools/src/magicdstool.c

    r25015 r25419  
    4242static bool torestoreMode(pxConfig *config);
    4343static bool torevertMode(pxConfig *config);
     44static bool completedrevertMode(pxConfig *config);
    4445
    4546static bool setmagicDSRunState(pxConfig *config, psS64 magic_id, const char *state);
    … …  
    7576        MODECASE(MAGICDSTOOL_MODE_TORESTORE,           torestoreMode);
    7677        MODECASE(MAGICDSTOOL_MODE_TOREVERT,            torevertMode);
     78        MODECASE(MAGICDSTOOL_MODE_COMPLETEDREVERT,     completedrevertMode);
    7779        default:
    7880            psAbort("invalid option (this should not happen)");
    … …  
    396398    PS_ASSERT_PTR_NON_NULL(config, false);
    397399
     400    PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false);
     401
    398402    psMetadata *where = psMetadataAlloc();
    399403    PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
    400404    PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
    401     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    402     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
     405    pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "==");
    403406
    404407    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    405408    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    406409
    407     // look for "inputs" that need to processed
    408     psString query = pxDataGet("magicdstool_todestreak.sql");
     410    psString sql_file = NULL;
     411    psStringAppend(&sql_file, "magicdstool_todestreak_%s.sql", stage);
     412
     413    psString query = pxDataGet(sql_file);
    409414    if (!query) {
    410         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    411         return false;
    412     }
     415        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", sql_file);
     416        psFree(sql_file);
     417        return false;
     418    }
     419    psFree(sql_file);
    413420
    414421    if (psListLength(where->list)) {
    415422        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    416         psStringAppend(&query, " WHERE %s", whereClause);
     423        psStringAppend(&query, " AND %s", whereClause);
    417424        psFree(whereClause);
    418425    }
    … …  
    817824    return true;
    818825}
    819 
    820 static bool getskycellsMode(pxConfig *config)
    821 {
    822     // required
    823     PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
     826static bool completedrevertMode(pxConfig *config)
     827{
     828    PS_ASSERT_PTR_NON_NULL(config, false);
    824829
    825830    psMetadata *where = psMetadataAlloc();
    826     PXOPT_COPY_STR(config->args, where, "-class_id",    "warpSkyCellMap.class_id", "==");
    827     PXOPT_COPY_STR(config->args, where, "-skycell_id",  "warpSkyCellMap.skycell_id", "==");
    828 
    829     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    830 
    831     psString query = pxDataGet("magicdstool_getskycells.sql");
    832     if (!query) {
    833         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    834         return false;
    835     }
    836 
     831    PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magicDSRun.magic_ds_id", "==");
     832    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
     833
     834    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     835
     836    psString query = pxDataGet("magicdstool_completedrevert.sql");
     837    // treat limit == 0 as "no limit"
     838    if (limit) {
     839        psString limitString = psDBGenerateLimitSQL(limit);
     840        psStringAppend(&query, " %s", limitString);
     841        psFree(limitString);
     842    }
     843
     844    psString whereString = NULL;
    837845    if (psListLength(where->list)) {
    838846        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    839         psStringAppend(&query, " AND %s", whereClause);
     847        psStringAppend(&whereString, "\nAND %s", whereClause);
    840848        psFree(whereClause);
    841849    }
    842850    psFree(where);
    843851
    844     if (!p_psDBRunQueryF(config->dbh, query, magic_ds_id)) {
    845         psError(PS_ERR_UNKNOWN, false, "database error");
    846         psFree(query);
    847         return false;
    848     }
     852    if (!p_psDBRunQueryF(config->dbh, query, whereString ? whereString : "")) {
     853        psFree(whereString);
     854        psError(PS_ERR_UNKNOWN, false, "failed to revert");
     855        return false;
     856    }
     857    psFree(whereString);
    849858    psFree(query);
    850 
    851859    psArray *output = p_psDBFetchResult(config->dbh);
    852860    if (!output) {
    … …  
    868876        return true;
    869877    }
    870 
    871     if (psArrayLength(output)) {
    872         // negative simple so the default is true
    873         if (!ippdbPrintMetadatas(stdout, output, "magicDiffSkyfile", !simple)) {
    874             psError(PS_ERR_UNKNOWN, false, "failed to print array");
     878    for (int i=0; i<psArrayLength(output); i++) {
     879        psMetadata *row = output->data[i];
     880        psS64 magic_ds_id = psMetadataLookupS64(NULL, row, "magic_ds_id");
     881        psString old_state = psMetadataLookupStr(NULL, row, "state");
     882        psString new_state;
     883        if (!strcmp(old_state, "goto_censored")) {
     884            new_state = "censored";
     885        } else if (!strcmp(old_state, "goto_restored")) {
     886            new_state = "restored";
     887        } else {
     888            psError(PXTOOLS_ERR_PROG, true, "unexpected state found: %s", old_state);
    875889            psFree(output);
    876890            return false;
    877891        }
    878     }
    879 
     892        char *query2 = "UPDATE magicDSRun SET state = '%s' WHERE magic_ds_id = %" PRId64;
     893        if (!p_psDBRunQueryF(config->dbh, query2, magic_ds_id, new_state)) {
     894            psError(PS_ERR_UNKNOWN, false, "failed to set run magicDSRun.state to %s", new_state);
     895            return false;
     896        }
     897    }
    880898    psFree(output);
    881899
    … …  
    883901}
    884902
    885 static bool setmagicDSRunState(pxConfig *config, psS64 magic_ds_id, const char *state)
    886 {
    887     PS_ASSERT_PTR_NON_NULL(state, false);
    888 
    889     // check that state is a valid string value
    890     if (!(
    891             (strncmp(state, "new", 4) == 0)
    892             || (strncmp(state, "full", 5) == 0)
    893         )
    894     ) {
    895         psError(PS_ERR_UNKNOWN, false,
    896                 "invalid magicDSRun state: %s", state);
    897         return false;
    898     }
    899 
    900     char *query = "UPDATE magicDSRun SET state = '%s' WHERE magic_ds_id = %" PRId64;
    901     if (!p_psDBRunQueryF(config->dbh, query, state, magic_ds_id)) {
    902         psError(PS_ERR_UNKNOWN, false,
    903                 "failed to change state for magic_id %" PRId64, magic_ds_id);
    904         return false;
    905     }
    906 
    907     return true;
    908 }
    909 
    910 static bool toremoveMode(pxConfig *config)
    911 {
    912     PS_ASSERT_PTR_NON_NULL(config, false);
     903static bool getskycellsMode(pxConfig *config)
     904{
     905    // required
     906    PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
    913907
    914908    psMetadata *where = psMetadataAlloc();
    915     PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
    916     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
    917     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    918 
    919     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     909    PXOPT_COPY_STR(config->args, where, "-class_id",    "warpSkyCellMap.class_id", "==");
     910    PXOPT_COPY_STR(config->args, where, "-skycell_id",  "warpSkyCellMap.skycell_id", "==");
     911
    920912    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    921913
    922     // look for "inputs" that need to processed
    923     psString query = pxDataGet("magicdstool_toremove.sql");
     914    psString query = pxDataGet("magicdstool_getskycells.sql");
    924915    if (!query) {
    925916        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    … …  
    929920    if (psListLength(where->list)) {
    930921        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    931         psStringAppend(&query, " WHERE %s", whereClause);
     922        psStringAppend(&query, " AND %s", whereClause);
    932923        psFree(whereClause);
    933924    }
    934925    psFree(where);
    935926
    936     // treat limit == 0 as "no limit"
    937     if (limit) {
    938         psString limitString = psDBGenerateLimitSQL(limit);
    939         psStringAppend(&query, " %s", limitString);
    940         psFree(limitString);
    941     }
    942 
    943     if (!p_psDBRunQuery(config->dbh, query)) {
     927    if (!p_psDBRunQueryF(config->dbh, query, magic_ds_id)) {
    944928        psError(PS_ERR_UNKNOWN, false, "database error");
    945929        psFree(query);
    … …  
    970954    if (psArrayLength(output)) {
    971955        // negative simple so the default is true
    972         if (!ippdbPrintMetadatas(stdout, output, "toremove", !simple)) {
     956        if (!ippdbPrintMetadatas(stdout, output, "magicDiffSkyfile", !simple)) {
    973957            psError(PS_ERR_UNKNOWN, false, "failed to print array");
    974958            psFree(output);
    … …  
    981965    return true;
    982966}
    983 static bool torestoreMode(pxConfig *config)
     967
     968static bool setmagicDSRunState(pxConfig *config, psS64 magic_ds_id, const char *state)
     969{
     970    PS_ASSERT_PTR_NON_NULL(state, false);
     971
     972    // check that state is a valid string value
     973    if (!(
     974            (strncmp(state, "new", 4) == 0)
     975            || (strncmp(state, "full", 5) == 0)
     976        )
     977    ) {
     978        psError(PS_ERR_UNKNOWN, false,
     979                "invalid magicDSRun state: %s", state);
     980        return false;
     981    }
     982
     983    char *query = "UPDATE magicDSRun SET state = '%s' WHERE magic_ds_id = %" PRId64;
     984    if (!p_psDBRunQueryF(config->dbh, query, state, magic_ds_id)) {
     985        psError(PS_ERR_UNKNOWN, false,
     986                "failed to change state for magic_id %" PRId64, magic_ds_id);
     987        return false;
     988    }
     989
     990    return true;
     991}
     992
     993static bool toremoveMode(pxConfig *config)
    984994{
    985995    PS_ASSERT_PTR_NON_NULL(config, false);
    … …  
    9941004
    9951005    // look for "inputs" that need to processed
    996     psString query = pxDataGet("magicdstool_torestore.sql");
     1006    psString query = pxDataGet("magicdstool_toremove.sql");
    9971007    if (!query) {
    9981008        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
    … …  
    10431053    if (psArrayLength(output)) {
    10441054        // negative simple so the default is true
    1045         if (!ippdbPrintMetadatas(stdout, output, "torestore", !simple)) {
     1055        if (!ippdbPrintMetadatas(stdout, output, "toremove", !simple)) {
    10461056            psError(PS_ERR_UNKNOWN, false, "failed to print array");
    10471057            psFree(output);
    … …  
    10541064    return true;
    10551065}
    1056 
    1057 
    1058 static bool torevertMode(pxConfig *config)
     1066static bool torestoreMode(pxConfig *config)
    10591067{
    10601068    PS_ASSERT_PTR_NON_NULL(config, false);
    10611069
    10621070    psMetadata *where = psMetadataAlloc();
    1063     PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false);
    1064 
    10651071    PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
    10661072    PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
    1067     pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "==");
     1073    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    10681074
    10691075    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    10701076    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    10711077
    1072     psString sql_file = NULL;
    1073     psStringAppend(&sql_file, "magicdstool_torevert_%s.sql", stage);
    1074 
    1075     psString query = pxDataGet(sql_file);
     1078    // look for "inputs" that need to processed
     1079    psString query = pxDataGet("magicdstool_torestore.sql");
    10761080    if (!query) {
    1077         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", sql_file);
    1078         psFree(sql_file);
    1079         return false;
    1080     }
    1081     psFree(sql_file);
     1081        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1082        return false;
     1083    }
    10821084
    10831085    if (psListLength(where->list)) {
    10841086        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    1085         psStringAppend(&query, " AND %s", whereClause);
     1087        psStringAppend(&query, " WHERE %s", whereClause);
    10861088        psFree(whereClause);
    10871089    }
    … …  
    11241126    if (psArrayLength(output)) {
    11251127        // negative simple so the default is true
     1128        if (!ippdbPrintMetadatas(stdout, output, "torestore", !simple)) {
     1129            psError(PS_ERR_UNKNOWN, false, "failed to print array");
     1130            psFree(output);
     1131            return false;
     1132        }
     1133    }
     1134
     1135    psFree(output);
     1136
     1137    return true;
     1138}
     1139
     1140
     1141static bool torevertMode(pxConfig *config)
     1142{
     1143    PS_ASSERT_PTR_NON_NULL(config, false);
     1144
     1145    psMetadata *where = psMetadataAlloc();
     1146    PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false);
     1147
     1148    PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
     1149    PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
     1150    pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "==");
     1151
     1152    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     1153    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     1154
     1155    psString sql_file = NULL;
     1156    psStringAppend(&sql_file, "magicdstool_torevert_%s.sql", stage);
     1157
     1158    psString query = pxDataGet(sql_file);
     1159    if (!query) {
     1160        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", sql_file);
     1161        psFree(sql_file);
     1162        return false;
     1163    }
     1164    psFree(sql_file);
     1165
     1166    if (psListLength(where->list)) {
     1167        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
     1168        psStringAppend(&query, " AND %s", whereClause);
     1169        psFree(whereClause);
     1170    }
     1171    psFree(where);
     1172
     1173    // treat limit == 0 as "no limit"
     1174    if (limit) {
     1175        psString limitString = psDBGenerateLimitSQL(limit);
     1176        psStringAppend(&query, " %s", limitString);
     1177        psFree(limitString);
     1178    }
     1179
     1180    if (!p_psDBRunQuery(config->dbh, query)) {
     1181        psError(PS_ERR_UNKNOWN, false, "database error");
     1182        psFree(query);
     1183        return false;
     1184    }
     1185    psFree(query);
     1186
     1187    psArray *output = p_psDBFetchResult(config->dbh);
     1188    if (!output) {
     1189        psErrorCode err = psErrorCodeLast();
     1190        switch (err) {
     1191            case PS_ERR_DB_CLIENT:
     1192                psError(PXTOOLS_ERR_SYS, false, "database error");
     1193            case PS_ERR_DB_SERVER:
     1194                psError(PXTOOLS_ERR_PROG, false, "database error");
     1195            default:
     1196                psError(PXTOOLS_ERR_PROG, false, "unknown error");
     1197        }
     1198
     1199        return false;
     1200    }
     1201    if (!psArrayLength(output)) {
     1202        psTrace("magicdstool", PS_LOG_INFO, "no rows found");
     1203        psFree(output);
     1204        return true;
     1205    }
     1206
     1207    if (psArrayLength(output)) {
     1208        // negative simple so the default is true
    11261209        if (!ippdbPrintMetadatas(stdout, output, "torevert", !simple)) {
    11271210            psError(PS_ERR_UNKNOWN, false, "failed to print array");

  • trunk/ippTools/src/magicdstool.h

    r24683 r25419  
    3535    MAGICDSTOOL_MODE_TORESTORE,
    3636    MAGICDSTOOL_MODE_TOREVERT,
     37    MAGICDSTOOL_MODE_COMPLETEDREVERT,
    3738} MAGICDStoolMode;
    3839

  • trunk/ippTools/src/magicdstoolConfig.c

    r24937 r25419  
    9393    // -todestreak
    9494    psMetadata *todestreakArgs = psMetadataAlloc();
     95    psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-stage", 0, "limit query to stage (required)", NULL);
    9596    psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic Destreak ID", 0);
    9697    psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0);
    9798    psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL);
    98     psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-stage", 0, "limit query to stage", NULL);
    9999    psMetadataAddU64(todestreakArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
    100100    psMetadataAddBool(todestreakArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
    … …  
    147147    psMetadataAddU64(torevertArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
    148148    psMetadataAddBool(torevertArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
     149
     150    // -completedrevert
     151    psMetadata *completedrevertArgs = psMetadataAlloc();
     152    psMetadataAddS64(completedrevertArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic Destreak ID", 0);
     153    psMetadataAddStr(completedrevertArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL);
     154    psMetadataAddU64(completedrevertArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
    149155
    150156    psFree(now);
    … …  
    174180                    MAGICDSTOOL_MODE_TOREVERT, torevertArgs);
    175181
     182    PXOPT_ADD_MODE("-completedrevert", "change state for runs that have finished reverting",
     183                    MAGICDSTOOL_MODE_COMPLETEDREVERT, completedrevertArgs);
     184
    176185    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
    177186        psError(PS_ERR_UNKNOWN, true, "option parsing failed");
Note: See TracChangeset for help on using the changeset viewer.