Index: branches/czw_branch/20100519/ippTools/src/pstamptool.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/pstamptool.c (revision 28334) +++ branches/czw_branch/20100519/ippTools/src/pstamptool.c (revision 28338) @@ -870,8 +870,9 @@ PXOPT_LOOKUP_S64(job_id, config->args, "-job_id", false, false); + PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", false, false); PXOPT_LOOKUP_S64(dep_id, config->args, "-dep_id", false, false); - if (!job_id && !dep_id) { - psError(PS_ERR_UNKNOWN, true, "at least -job_id or -dep_id is required"); + if (!job_id && !req_id && !dep_id) { + psError(PS_ERR_UNKNOWN, true, "at least one of -job_id -req_id or -dep_id is required"); return false; } @@ -888,5 +889,7 @@ PXOPT_COPY_S64(config->args, where, "-job_id", "job_id", "=="); + PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "=="); PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "=="); + PXOPT_COPY_STR(config->args, where, "-state", "pstampJob.state", "=="); psString query = pxDataGet("pstamptool_updatejob.sql"); Index: branches/czw_branch/20100519/ippTools/src/pstamptoolConfig.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/pstamptoolConfig.c (revision 28334) +++ branches/czw_branch/20100519/ippTools/src/pstamptoolConfig.c (revision 28338) @@ -160,6 +160,8 @@ // -updatejob psMetadata *updatejobArgs = psMetadataAlloc(); - 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); + psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-req_id", 0, "req_id of jobs to update", 0); + psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-job_id", 0, "job_id of jobs to update", 0); + psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-dep_id", 0, "dep_id of jobs to update", 0); + psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-state", 0, "current state of jobs to update", 0); psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-set_state", 0, "new state", NULL); psMetadataAddS16(updatejobArgs, PS_LIST_TAIL, "-set_fault", 0, "new result", 0); Index: branches/czw_branch/20100519/ippTools/src/pubtool.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/pubtool.c (revision 28334) +++ branches/czw_branch/20100519/ippTools/src/pubtool.c (revision 28338) @@ -151,37 +151,77 @@ PS_ASSERT_PTR_NON_NULL(config, false); - psMetadata *where = psMetadataAlloc(); // WHERE conditions + psMetadata *diffWhere = psMetadataAlloc(); // WHERE conditions for diffs + psMetadata *camWhere = psMetadataAlloc(); // WHERE conditions for cams // required // optional - PXOPT_COPY_S64(config->args, where, "-client_id", "client_id", "=="); - pxAddLabelSearchArgs(config, where, "-label", "label", "=="); // define using newExp label + PXOPT_COPY_S64(config->args, diffWhere, "-client_id", "client_id", "=="); + pxAddLabelSearchArgs(config, diffWhere, "-label", "diffRun.label", "=="); + pxAddLabelSearchArgs(config, diffWhere, "-data_group", "diffRun.data_group", "LIKE"); + PXOPT_COPY_TIME(config->args, diffWhere, "-dateobs_begin", "rawExp.dateobs", ">="); + PXOPT_COPY_TIME(config->args, diffWhere, "-dateobs_end", "rawExp.dateobs", "<="); + PXOPT_COPY_STR(config->args, diffWhere, "-filter", "rawExp.filter", "LIKE"); + PXOPT_COPY_STR(config->args, diffWhere, "-obs_mode", "rawExp.obs_mode", "LIKE"); + + PXOPT_COPY_S64(config->args, camWhere, "-client_id", "client_id", "=="); + pxAddLabelSearchArgs(config, camWhere, "-label", "camRun.label", "=="); + pxAddLabelSearchArgs(config, camWhere, "-data_group", "camRun.data_group", "LIKE"); + PXOPT_COPY_TIME(config->args, camWhere, "-dateobs_begin", "rawExp.dateobs", ">="); + PXOPT_COPY_TIME(config->args, camWhere, "-dateobs_end", "rawExp.dateobs", "<="); + PXOPT_COPY_STR(config->args, camWhere, "-filter", "rawExp.filter", "LIKE"); + PXOPT_COPY_STR(config->args, camWhere, "-obs_mode", "rawExp.obs_mode", "LIKE"); + + PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false); + PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psString query = pxDataGet("pubtool_definerun.sql"); // Query to run if (!query) { psError(PXTOOLS_ERR_SYS, false, "Failed to retreive SQL statement"); - psFree(where); - return false; + psFree(diffWhere); + psFree(camWhere); + return false; + } + + if (!rerun) { + psStringAppend(&query, "\nWHERE publishRun.client_id IS NULL"); + } + + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, "\n%s", limitString); + psFree(limitString); } if (!psDBTransaction(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "Database error"); - psFree(where); - return false; - } - - psString whereClause = psStringCopy(""); // Additional constraints to add to query - if (psListLength(where->list)) { - psString clause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&whereClause, "\n AND %s", clause); + psFree(diffWhere); + psFree(camWhere); + return false; + } + + psString whereDiff = psStringCopy(""); // Additional constraints to add to query + if (psListLength(diffWhere->list)) { + psString clause = psDBGenerateWhereConditionSQL(diffWhere, NULL); + psStringAppend(&whereDiff, "\n AND %s", clause); psFree(clause); } - psFree(where); - - if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause)) { + psFree(diffWhere); + + psString whereCam = psStringCopy(""); // Additional constraints to add to query + if (psListLength(camWhere->list)) { + psString clause = psDBGenerateWhereConditionSQL(camWhere, NULL); + psStringAppend(&whereCam, "\n AND %s", clause); + psFree(clause); + } + psFree(camWhere); + + if (!p_psDBRunQueryF(config->dbh, query, whereDiff, whereCam)) { psError(PS_ERR_UNKNOWN, false, "Database error"); psFree(query); - psFree(whereClause); + psFree(whereDiff); + psFree(whereCam); if (!psDBRollback(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "Database error"); @@ -190,5 +230,6 @@ } psFree(query); - psFree(whereClause); + psFree(whereDiff); + psFree(whereCam); psArray *output = p_psDBFetchResult(config->dbh); // Output of SELECT statement @@ -202,4 +243,14 @@ if (!psArrayLength(output)) { psTrace("pubtool", PS_LOG_INFO, "No rows found"); + psFree(output); + return true; + } + + if (pretend) { + if (!ippdbPrintMetadatas(stdout, output, "publishRun", !simple)) { + psError(psErrorCodeLast(), false, "Failed to print array"); + psFree(output); + return false; + } psFree(output); return true; @@ -241,5 +292,5 @@ PXOPT_COPY_STR(config->args, where, "-stage", "publishClient.stage", "=="); PXOPT_COPY_STR(config->args, where, "-comment", "publishClient.comment", "LIKE"); - PXOPT_COPY_STR(config->args, where, "-label", "publishRun.label", "=="); + pxAddLabelSearchArgs(config, where, "-label", "label", "=="); // optional Index: branches/czw_branch/20100519/ippTools/src/pubtoolConfig.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/pubtoolConfig.c (revision 28334) +++ branches/czw_branch/20100519/ippTools/src/pubtoolConfig.c (revision 28338) @@ -64,4 +64,13 @@ psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-client_id", 0, "search by client_id", 0); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "set and search by label", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by data_group", NULL); + psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<=)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-obs_mode", 0, "search by observation mode", NULL); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-rerun", 0, "Re-run publish?", false); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-pretend", 0, "Pretend to define?", false); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, "use simple output format?", false); + psMetadataAddU64(definerunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set", 0); // -pending @@ -70,5 +79,5 @@ psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-stage", 0, "search on source", NULL); psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-comment", 0, "search on comment (LIKE)", NULL); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-label", 0, "search on label", NULL); + psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search on label", NULL); psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple", 0, "use simple output format?", false); psMetadataAddU64(pendingArgs, PS_LIST_TAIL, "-limit", 0, "limit result set", 0); Index: branches/czw_branch/20100519/ippTools/src/pxtools.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/pxtools.c (revision 28334) +++ branches/czw_branch/20100519/ippTools/src/pxtools.c (revision 28338) @@ -250,10 +250,11 @@ psMetadataItem *item = NULL; while ((item = psListGetAndIncrement(iter))) { + psMetadataItem *new = psMetadataItemCopy(item); // need to change the name and comment - psFree (item->name); - item->name = psStringCopy (field); - psFree (item->comment); - item->comment = psStringCopy (op); - if (!psMetadataAddItem(where, item, PS_LIST_TAIL, PS_META_DUPLICATE_OK)) { + psFree (new->name); + new->name = psStringCopy (field); + psFree (new->comment); + new->comment = psStringCopy (op); + if (!psMetadataAddItem(where, new, PS_LIST_TAIL, PS_META_DUPLICATE_OK)) { psError(psErrorCodeLast(), false, "failed to add item %s", field); psFree(where); @@ -261,5 +262,5 @@ } } - psFree (iter); + psFree(iter); } return true;