Index: trunk/ippTools/src/magicdstool.c =================================================================== --- trunk/ippTools/src/magicdstool.c (revision 25420) +++ trunk/ippTools/src/magicdstool.c (revision 25423) @@ -40,5 +40,4 @@ static bool getskycellsMode(pxConfig *config); static bool toremoveMode(pxConfig *config); -static bool torestoreMode(pxConfig *config); static bool torevertMode(pxConfig *config); static bool completedrevertMode(pxConfig *config); @@ -74,5 +73,4 @@ MODECASE(MAGICDSTOOL_MODE_GETSKYCELLS, getskycellsMode); MODECASE(MAGICDSTOOL_MODE_TOREMOVE, toremoveMode); - MODECASE(MAGICDSTOOL_MODE_TORESTORE, torestoreMode); MODECASE(MAGICDSTOOL_MODE_TOREVERT, torevertMode); MODECASE(MAGICDSTOOL_MODE_COMPLETEDREVERT, completedrevertMode); @@ -401,5 +399,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "=="); + PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magicDSRun.magic_ds_id", "=="); PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "=="); @@ -803,4 +801,10 @@ PS_ASSERT_PTR_NON_NULL(config, false); + PXOPT_LOOKUP_BOOL(i_am_sure, config->args, "-i_am_sure", true); + if (!i_am_sure) { + psError(PS_ERR_UNKNOWN, true, "Reverting destreaked files must be done carefully. -i_am_sure is required."); + return false; + } + psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magicDSRun.magic_ds_id", "=="); @@ -809,5 +813,5 @@ pxAddLabelSearchArgs (config, where, "-label", "label", "=="); - psString query = psStringCopy("DELETE FROM magicDSFile USING magicDSFile, magicDSRun WHERE (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id) AND magicDSFile.fault != 0"); + psString query = pxDataGet("magicdstool_revertdestreakedfile.sql"); if (psListLength(where->list)) { @@ -815,4 +819,7 @@ psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); + } else { + psError(PS_ERR_UNKNOWN, true, "search arguments are required"); + return false; } psFree(where); @@ -820,6 +827,8 @@ if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "failed to revert"); - return false; - } + psFree(query); + return false; + } + psFree(query); return true; } @@ -891,5 +900,5 @@ } char *query2 = "UPDATE magicDSRun SET state = '%s' WHERE magic_ds_id = %" PRId64; - if (!p_psDBRunQueryF(config->dbh, query2, magic_ds_id, new_state)) { + if (!p_psDBRunQueryF(config->dbh, query2, new_state, magic_ds_id)) { psError(PS_ERR_UNKNOWN, false, "failed to set run magicDSRun.state to %s", new_state); return false; @@ -971,9 +980,13 @@ // check that state is a valid string value - if (!( - (strncmp(state, "new", 4) == 0) - || (strncmp(state, "full", 5) == 0) - ) - ) { + if (!((strcmp(state, "new") == 0) || + (strcmp(state, "full") == 0) || + (strcmp(state, "restored") == 0) || + (strcmp(state, "censored") == 0) || + (strcmp(state, "purged") == 0) || + (strcmp(state, "goto_restored") == 0) || + (strcmp(state, "goto_censored") == 0) || + (strcmp(state, "goto_purged") == 0)) + ) { psError(PS_ERR_UNKNOWN, false, "invalid magicDSRun state: %s", state); @@ -1064,26 +1077,33 @@ return true; } -static bool torestoreMode(pxConfig *config) + +static bool torevertMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); psMetadata *where = psMetadataAlloc(); + PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false); + PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "=="); PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); - pxAddLabelSearchArgs (config, where, "-label", "label", "=="); + pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - // look for "inputs" that need to processed - psString query = pxDataGet("magicdstool_torestore.sql"); + psString sql_file = NULL; + psStringAppend(&sql_file, "magicdstool_torevert_%s.sql", stage); + + psString query = pxDataGet(sql_file); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", sql_file); + psFree(sql_file); + return false; + } + psFree(sql_file); if (psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " WHERE %s", whereClause); + psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } @@ -1126,85 +1146,4 @@ if (psArrayLength(output)) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "torestore", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - } - - psFree(output); - - return true; -} - - -static bool torevertMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - psMetadata *where = psMetadataAlloc(); - PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false); - - PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "=="); - PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); - pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "=="); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - psString sql_file = NULL; - psStringAppend(&sql_file, "magicdstool_torevert_%s.sql", stage); - - psString query = pxDataGet(sql_file); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", sql_file); - psFree(sql_file); - return false; - } - psFree(sql_file); - - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - psFree(where); - - // treat limit == 0 as "no limit" - if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); - psStringAppend(&query, " %s", limitString); - psFree(limitString); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psErrorCode err = psErrorCodeLast(); - switch (err) { - case PS_ERR_DB_CLIENT: - psError(PXTOOLS_ERR_SYS, false, "database error"); - case PS_ERR_DB_SERVER: - psError(PXTOOLS_ERR_PROG, false, "database error"); - default: - psError(PXTOOLS_ERR_PROG, false, "unknown error"); - } - - return false; - } - if (!psArrayLength(output)) { - psTrace("magicdstool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - if (psArrayLength(output)) { - // negative simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "torevert", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); Index: trunk/ippTools/src/magicdstool.h =================================================================== --- trunk/ippTools/src/magicdstool.h (revision 25420) +++ trunk/ippTools/src/magicdstool.h (revision 25423) @@ -33,5 +33,4 @@ MAGICDSTOOL_MODE_GETSKYCELLS, MAGICDSTOOL_MODE_TOREMOVE, - MAGICDSTOOL_MODE_TORESTORE, MAGICDSTOOL_MODE_TOREVERT, MAGICDSTOOL_MODE_COMPLETEDREVERT, Index: trunk/ippTools/src/magicdstoolConfig.c =================================================================== --- trunk/ippTools/src/magicdstoolConfig.c (revision 25420) +++ trunk/ippTools/src/magicdstoolConfig.c (revision 25423) @@ -114,9 +114,10 @@ psMetadataAddStr(revertdestreakedfileArgs, PS_LIST_TAIL, "-component", 0, "search by component", NULL); psMetadataAddS16(revertdestreakedfileArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); + psMetadataAddBool(revertdestreakedfileArgs, PS_LIST_TAIL, "-i_am_sure", 0, "confirm that you know what you are doing", false); psMetadataAddStr(revertdestreakedfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL); // -getskycells psMetadata *getskycellsArgs = psMetadataAlloc(); - psMetadataAddS64(getskycellsArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "define magic de-streak ID (required)", 0); + psMetadataAddS64(getskycellsArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "define magic de-streak ID", 0); psMetadataAddStr(getskycellsArgs, PS_LIST_TAIL, "-class_id", 0, "define class identifier", NULL); psMetadataAddStr(getskycellsArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell identifier", NULL); @@ -130,12 +131,4 @@ psMetadataAddU64(toremoveArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(toremoveArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - - // -torestore - psMetadata *torestoreArgs = psMetadataAlloc(); - psMetadataAddS64(torestoreArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic Destreak ID", 0); - psMetadataAddS64(torestoreArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0); - psMetadataAddStr(torestoreArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL); - psMetadataAddU64(torestoreArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(torestoreArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -torevert @@ -175,7 +168,5 @@ PXOPT_ADD_MODE("-toremove", "backup images pending removal", MAGICDSTOOL_MODE_TOREMOVE, toremoveArgs); - PXOPT_ADD_MODE("-torestore", "images pending restore of exicsed streak pixels", - MAGICDSTOOL_MODE_TORESTORE, torestoreArgs); - PXOPT_ADD_MODE("-torevert", "faulted images to revert", + PXOPT_ADD_MODE("-torevert", "images to restore or revert", MAGICDSTOOL_MODE_TOREVERT, torevertArgs);