Index: trunk/ippTools/src/pstamptool.c =================================================================== --- trunk/ippTools/src/pstamptool.c (revision 27858) +++ trunk/ippTools/src/pstamptool.c (revision 27874) @@ -40,4 +40,5 @@ static bool updatereqMode(pxConfig *config); static bool revertreqMode(pxConfig *config); +static bool pendingcleanupMode(pxConfig *config); static bool addjobMode(pxConfig *config); static bool listjobMode(pxConfig *config); @@ -81,4 +82,5 @@ MODECASE(PSTAMPTOOL_MODE_UPDATEREQ, updatereqMode); MODECASE(PSTAMPTOOL_MODE_REVERTREQ, revertreqMode); + MODECASE(PSTAMPTOOL_MODE_PENDINGCLEANUP, pendingcleanupMode); MODECASE(PSTAMPTOOL_MODE_ADDJOB, addjobMode); MODECASE(PSTAMPTOOL_MODE_LISTJOB, listjobMode); @@ -265,4 +267,5 @@ NULL, // outProduct uri, + NULL, // outdir 0 // fault )) { @@ -341,5 +344,5 @@ } -static bool listreqMode(pxConfig *config) +static bool pendingcleanupMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -347,21 +350,23 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "=="); - PXOPT_COPY_S64(config->args, where, "-not_req_id", "req_id", "!="); - PXOPT_COPY_STR(config->args, where, "-name", "name", "=="); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + pxAddLabelSearchArgs(config, where, "-label", "label", "LIKE"); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - if (!psListLength(where->list)) { - psError(PS_ERR_UNKNOWN, true, "-req_id or -name must be supplied"); - return false; - } - - psString query = psStringCopy("SELECT * from pstampRequest"); - - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " WHERE %s", whereClause); - psFree(whereClause); - psFree(where); + psString query = pxDataGet("pstamptool_pendingcleanup.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "pstampRequest"); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + psStringAppend(&query, " ORDER BY priority DESC, req_id"); // treat limit == 0 as "no limit" @@ -385,10 +390,7 @@ } if (!psArrayLength(output)) { - psTrace("pstamptool", PS_LOG_INFO, "request not found"); - // This causes main to exit with PS_EXIT_DATA_ERROR which the script is looking for - psError(PXTOOLS_ERR_CONFIG, true, "request not found"); - psFree(output); - // we return false so that the caller can determine that a request does not exist - return false; + psTrace("pstamptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; } @@ -405,24 +407,27 @@ } -static bool completedreqMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - psMetadata *where = psMetadataAlloc(); - pxAddLabelSearchArgs(config, where, "-label", "label", "LIKE"); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); +static bool listreqMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "=="); + PXOPT_COPY_S64(config->args, where, "-not_req_id", "req_id", "!="); + PXOPT_COPY_STR(config->args, where, "-name", "name", "=="); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - psString query = pxDataGet("pstamptool_completedreq.sql"); - - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - psFree(where); - - psStringAppend(&query, " ORDER BY priority DESC, req_id"); + if (!psListLength(where->list)) { + psError(PS_ERR_UNKNOWN, true, "-req_id or -name must be supplied"); + return false; + } + + psString query = psStringCopy("SELECT * from pstampRequest"); + + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " WHERE %s", whereClause); + psFree(whereClause); + psFree(where); // treat limit == 0 as "no limit" @@ -438,4 +443,5 @@ return false; } + psFree(query); psArray *output = p_psDBFetchResult(config->dbh); @@ -444,9 +450,11 @@ return false; } - if (!psArrayLength(output)) { - psTrace("pstamptool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; + psTrace("pstamptool", PS_LOG_INFO, "request not found"); + // This causes main to exit with PS_EXIT_DATA_ERROR which the script is looking for + psError(PXTOOLS_ERR_CONFIG, true, "request not found"); + psFree(output); + // we return false so that the caller can determine that a request does not exist + return false; } @@ -463,23 +471,103 @@ } +static bool completedreqMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + pxAddLabelSearchArgs(config, where, "-label", "label", "LIKE"); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + psString query = pxDataGet("pstamptool_completedreq.sql"); + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + psStringAppend(&query, " ORDER BY priority DESC, req_id"); + + // 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; + } + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + if (!psArrayLength(output)) { + psTrace("pstamptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "pstampRequest", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} + static bool updatereqMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", true, false); - PXOPT_LOOKUP_STR(state, config->args, "-state", false, false); - PXOPT_LOOKUP_STR(outProduct, config->args, "-outProduct", false, false); - PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); - PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); - PXOPT_LOOKUP_STR(name, config->args, "-name", false, false); - PXOPT_LOOKUP_STR(reqType, config->args, "-reqType", false, false); - - psString query = NULL; - psStringAppend(&query, "UPDATE pstampRequest SET"); - + // PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", true, false); + PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); + PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_STR(outProduct, config->args, "-set_outProduct", false, false); + PXOPT_LOOKUP_S16(fault, config->args, "-set_fault", false, false); + PXOPT_LOOKUP_STR(uri, config->args, "-set_uri", false, false); + PXOPT_LOOKUP_STR(outdir, config->args, "-set_outdir", false, false); + PXOPT_LOOKUP_STR(name, config->args, "-set_name", false, false); + PXOPT_LOOKUP_STR(reqType, config->args, "-set_reqType", false, false); + PXOPT_LOOKUP_BOOL(clearfault,config->args, "-clearfault", false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "=="); + PXOPT_COPY_S64(config->args, where, "-req_id_max", "req_id", "<="); + PXOPT_COPY_S32(config->args, where, "-fault", "fault", "=="); + PXOPT_COPY_STR(config->args, where, "-state", "state", "=="); + pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "LIKE"); + if (!psListLength(where->list)) { + psFree(where); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; + } + + psString query = psStringCopy("UPDATE pstampRequest SET"); + + psString stateCheck = NULL; char c = ' '; if (state) { psStringAppend(&query, "%c state = '%s'", c, state); c = ','; + if (!strcmp(state, "goto_cleaned")) { + psStringAppend(&stateCheck, " AND state != 'cleaned'"); + } + } + if (label) { + psStringAppend(&query, "%c label = '%s'", c, label); + c = ','; } if (outProduct) { @@ -487,5 +575,16 @@ c = ','; } - if (fault) { + if (outdir) { + psStringAppend(&query, "%c outdir = '%s'", c, outdir); + c = ','; + } + if (clearfault) { + if (fault) { + psError(PXTOOLS_ERR_CONFIG, true, "only one of -fault and -clearfault is allowed"); + return false; + } + psStringAppend(&query, "%c fault = 0", c); + c = ','; + } else if (fault) { psStringAppend(&query, "%c fault = %d", c, fault); c = ','; @@ -503,10 +602,17 @@ c = ','; } - if (!state && !outProduct && !fault && !uri && !name && !reqType) { - psError(PS_ERR_UNKNOWN, true, "at least one of state, outProduct, fault, uri, name, and reqType must be specified"); - return false; - } - - psStringAppend(&query, " WHERE req_id = %" PRId64, req_id); + if (c != ',') { + psError(PS_ERR_UNKNOWN, true, "at least one set option is required"); + return false; + } + + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, "\nWHERE %s", whereClause); + psFree(whereClause); + psFree(where); + + if (stateCheck) { + psStringAppend(&query, stateCheck); + } if (!p_psDBRunQuery(config->dbh, query)) { @@ -516,11 +622,6 @@ } - psU64 affected = psDBAffectedRows(config->dbh); - // note zero is not an error - if (affected > 1) { - psError(PS_ERR_UNKNOWN, false, "should have affected one row but %" - PRIu64 " rows were modified", affected); - return false; - } + // psU64 affected = psDBAffectedRows(config->dbh); + // psLogMsg("pstamptool", PS_LOG_INFO, "Updated %" PRIu64 " pstampRequests", affected); return true; @@ -778,6 +879,12 @@ return false; } - PXOPT_LOOKUP_STR(state, config->args, "-state", true, false); - PXOPT_LOOKUP_S32(fault, config->args, "-fault", false, false); + + PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); + PXOPT_LOOKUP_S32(fault, config->args, "-set_fault", false, false); + + if (!state && !fault) { + psError(PS_ERR_UNKNOWN, true, "at least one of -set_state and -set_fault is required"); + return false; + } psMetadata *where = psMetadataAlloc(); @@ -786,13 +893,16 @@ PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "=="); - psString faultStr = NULL; - if (!fault) { - faultStr = psStringCopy(""); - } else { - psStringAppend(&faultStr, "\n, pstampJob.fault = %d", fault); - } - psString query = pxDataGet("pstamptool_updatejob.sql"); + char c = ' '; + if (state) { + psStringAppend(&query, "\n %c pstampJob.state = '%s'", c, state); + c = ','; + } + if (fault) { + psStringAppend(&query, "\n %c pstampJob.fault = %d", c, fault); + c = ','; + } + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " WHERE %s", whereClause); @@ -800,10 +910,9 @@ psFree(where); - if (!p_psDBRunQueryF(config->dbh, query, state, faultStr)) { + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); return false; } - psFree(faultStr); psFree(query); @@ -1159,5 +1268,5 @@ PXOPT_LOOKUP_S64(dep_id, config->args, "-dep_id", true, false); PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); - PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); + PXOPT_LOOKUP_S16(fault, config->args, "-set_fault", false, false); if (!fault && !state) { Index: trunk/ippTools/src/pstamptool.h =================================================================== --- trunk/ippTools/src/pstamptool.h (revision 27858) +++ trunk/ippTools/src/pstamptool.h (revision 27874) @@ -34,4 +34,5 @@ PSTAMPTOOL_MODE_UPDATEREQ, PSTAMPTOOL_MODE_REVERTREQ, + PSTAMPTOOL_MODE_PENDINGCLEANUP, PSTAMPTOOL_MODE_ADDJOB, PSTAMPTOOL_MODE_LISTJOB, Index: trunk/ippTools/src/pstamptoolConfig.c =================================================================== --- trunk/ippTools/src/pstamptoolConfig.c (revision 27858) +++ trunk/ippTools/src/pstamptoolConfig.c (revision 27874) @@ -98,11 +98,18 @@ // -updatereq psMetadata *updatereqArgs = psMetadataAlloc(); - psMetadataAddS64(updatereqArgs, PS_LIST_TAIL, "-req_id", 0, "req_id for which to change state", 0); - psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); - psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-outProduct", 0, "define request outProduct", NULL); - psMetadataAddS16(updatereqArgs, PS_LIST_TAIL, "-fault", 0, "define request fault code", 0); - psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-uri", 0, "define the uri", NULL); - psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-name", 0, "define the name", NULL); - psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-reqType", 0, "define the reqType", NULL); + psMetadataAddS64(updatereqArgs, PS_LIST_TAIL, "-req_id", 0, "req_id for which to update", 0); + psMetadataAddS64(updatereqArgs, PS_LIST_TAIL, "-req_id_max", 0, "maximum req_id for which to update", 0); + psMetadataAddS16(updatereqArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by pstampJob label (LIKE comparision)", NULL); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_state", 0, "new state", NULL); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_label", 0, "new label", NULL); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_outProduct", 0, "new outProduct", NULL); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_outdir", 0, "new outdir", NULL); + psMetadataAddS16(updatereqArgs, PS_LIST_TAIL, "-set_fault", 0, "new fault code", 0); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_uri", 0, "new uri", NULL); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_name", 0, "new name", NULL); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-set_reqType", 0, "new reqType", NULL); + psMetadataAddBool(updatereqArgs, PS_LIST_TAIL, "-clearfault", 0, "set fault to zero", false); // -revertreq @@ -112,4 +119,12 @@ psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-state", 0, "state to revert", NULL); psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by pstampRequest label (LIKE comparision)", NULL); + + // -pendingcleanup + psMetadata *pendingcleanupArgs = psMetadataAlloc(); + psMetadataAddS64(pendingcleanupArgs, PS_LIST_TAIL, "-req_id", 0, "define req_id", 0); + psMetadataAddS64(pendingcleanupArgs, PS_LIST_TAIL, "-ds_id", 0, "define ds_id", 0); + psMetadataAddStr(pendingcleanupArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by pstampRequest label (LIKE comparision)", NULL); + psMetadataAddU64(pendingcleanupArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(pendingcleanupArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addjob @@ -145,6 +160,6 @@ psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-job_id", 0, "req_id for which to change state", 0); psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-dep_id", 0, "dep_id for which to change state", 0); - psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); - psMetadataAddS16(updatejobArgs, PS_LIST_TAIL, "-fault", 0, "new result", 0); + psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-set_state", 0, "new state", NULL); + psMetadataAddS16(updatejobArgs, PS_LIST_TAIL, "-set_fault", 0, "new result", 0); // -revertjob @@ -160,4 +175,6 @@ // -getdependent psMetadata *getdependentArgs = psMetadataAlloc(); + // arguabely all of these could be -set_ arguments, but since this mode is both a query and + // a create if doesn't exist I like it this way psMetadataAddS64(getdependentArgs, PS_LIST_TAIL, "-stage_id", 0, "define stage id for dependent (required)", 0); psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-stage", 0, "define stage for dependent (required)", NULL); @@ -173,5 +190,5 @@ psMetadataAddS64(updatedependentArgs, PS_LIST_TAIL, "-dep_id", 0, "define id for dependent (required)", 0); psMetadataAddStr(updatedependentArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state", NULL); - psMetadataAddS16(updatedependentArgs, PS_LIST_TAIL, "-fault", 0, "new value for fault", 0); + psMetadataAddS16(updatedependentArgs, PS_LIST_TAIL, "-set_fault", 0, "new value for fault", 0); // -revertdependent @@ -227,4 +244,5 @@ PXOPT_ADD_MODE("-completedreq", "", PSTAMPTOOL_MODE_COMPLETEDREQ, completedreqArgs); PXOPT_ADD_MODE("-revertreq", "", PSTAMPTOOL_MODE_REVERTREQ, revertreqArgs); + PXOPT_ADD_MODE("-pendingcleanup", "", PSTAMPTOOL_MODE_PENDINGCLEANUP, pendingcleanupArgs); PXOPT_ADD_MODE("-addjob", "", PSTAMPTOOL_MODE_ADDJOB, addjobArgs);