Index: trunk/ippTools/share/pstamptool_addjob_otherjob.sql =================================================================== --- trunk/ippTools/share/pstamptool_addjob_otherjob.sql (revision 19218) +++ trunk/ippTools/share/pstamptool_addjob_otherjob.sql (revision 19219) @@ -1,3 +1,3 @@ INSERT INTO pstampJob - (req_id, rownum, state, jobType, uri, outputBase, fault) - VALUES( %s, '%s', '%s', '%s', '%s', '%s', %s) + (req_id, rownum, state, jobType, uri, exp_id, outputBase, fault) + VALUES( %lld, '%s', '%s', '%s', '%s', %lld, '%s', %s) Index: trunk/ippTools/share/pstamptool_addjob_stampjob.sql =================================================================== --- trunk/ippTools/share/pstamptool_addjob_stampjob.sql (revision 19218) +++ trunk/ippTools/share/pstamptool_addjob_stampjob.sql (revision 19219) @@ -1,3 +1,3 @@ INSERT INTO pstampJob - (req_id, rownum, state, jobType, uri, outputBase, fault, args) - VALUES( %s, '%s', '%s', '%s', '%s', '%s', %s, '%s') + (req_id, rownum, state, jobType, uri, exp_id, outputBase, fault, args) + VALUES( %lld, '%s', '%s', '%s', '%s', %lld, '%s', %s, '%s') Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 19218) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 19219) @@ -1015,4 +1015,5 @@ fault SMALLINT, uri VARCHAR(255), + exp_id BIGINT, outputBase VARCHAR(255), args VARCHAR(511), Index: trunk/ippTools/src/pstamptool.c =================================================================== --- trunk/ippTools/src/pstamptool.c (revision 19218) +++ trunk/ippTools/src/pstamptool.c (revision 19219) @@ -38,10 +38,10 @@ static bool listReqMode(pxConfig *config); static bool pendingReqMode(pxConfig *config); -static bool processedReqMode(pxConfig *config); +static bool updateReqMode(pxConfig *config); static bool revertReqMode(pxConfig *config); static bool addJobMode(pxConfig *config); static bool listJobMode(pxConfig *config); static bool pendingJobMode(pxConfig *config); -static bool processedJobMode(pxConfig *config); +static bool updateJobMode(pxConfig *config); # define MODECASE(caseName, func) \ @@ -71,10 +71,10 @@ MODECASE(PSTAMPTOOL_MODE_LISTREQ, listReqMode); MODECASE(PSTAMPTOOL_MODE_PENDINGREQ, pendingReqMode); - MODECASE(PSTAMPTOOL_MODE_PROCESSEDREQ, processedReqMode); + MODECASE(PSTAMPTOOL_MODE_UPDATEREQ, updateReqMode); MODECASE(PSTAMPTOOL_MODE_REVERTREQ, revertReqMode); MODECASE(PSTAMPTOOL_MODE_ADDJOB, addJobMode); MODECASE(PSTAMPTOOL_MODE_LISTJOB, listJobMode); MODECASE(PSTAMPTOOL_MODE_PENDINGJOB, pendingJobMode); - MODECASE(PSTAMPTOOL_MODE_PROCESSEDJOB, processedJobMode); + MODECASE(PSTAMPTOOL_MODE_UPDATEJOB, updateJobMode); default: psAbort("invalid option (this should not happen)"); @@ -126,5 +126,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-ds_id", "ds_id", "=="); + PXOPT_COPY_S64(config->args, where, "-ds_id", "ds_id", "=="); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -174,5 +174,5 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(ds_id, config->args, "-ds_id", true, false); + PXOPT_LOOKUP_S64(ds_id, config->args, "-ds_id", true, false); PXOPT_LOOKUP_STR(lastFileset, config->args, "-last_fileset", false, false); PXOPT_LOOKUP_STR(state, config->args, "-state", false, false); @@ -196,5 +196,5 @@ } - psStringAppend(&query, " WHERE ds_id = '%s'", ds_id); + psStringAppend(&query, " WHERE ds_id = %" PRId64, ds_id); if (!p_psDBRunQuery(config->dbh, query)) { @@ -220,5 +220,5 @@ PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false); // PXOPT_LOOKUP_STR(outFileset, config->args, "-out_fileset", true, false); - PXOPT_LOOKUP_S32(ds_id, config->args, "-ds_id", false, false); + PXOPT_LOOKUP_S64(ds_id, config->args, "-ds_id", false, false); char *query ="INSERT INTO pstampRequest" @@ -250,5 +250,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-req_id", "req_id", "=="); + PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -309,5 +309,5 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(req_id, config->args, "-req_id", true, false); + PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", true, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -405,9 +405,9 @@ } -static bool processedReqMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - PXOPT_LOOKUP_STR(req_id, config->args, "-req_id", true, false); +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); @@ -450,5 +450,5 @@ } - psStringAppend(&query, " WHERE req_id = '%s'", req_id); + psStringAppend(&query, " WHERE req_id = %" PRId64, req_id); if (!p_psDBRunQuery(config->dbh, query)) { @@ -475,5 +475,5 @@ PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", true, false); - printf("Revert request %" PRId64 "\n", req_id); + // printf("Revert request %" PRId64 "\n", req_id); if (!p_psDBRunQuery(config->dbh, "DELETE FROM pstampJob where req_id = %" PRId64, req_id)) { @@ -497,6 +497,6 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false); - PXOPT_LOOKUP_STR(req_id, config->args, "-req_id", true, false); + PXOPT_LOOKUP_S64(uri, config->args, "-uri", true, false); + PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", true, false); PXOPT_LOOKUP_STR(rownum, config->args, "-rownum", true, false); PXOPT_LOOKUP_STR(job_type, config->args, "-job_type", false, false); @@ -505,4 +505,5 @@ PXOPT_LOOKUP_STR(stateString, config->args, "-state", false, false); PXOPT_LOOKUP_STR(fault, config->args, "-fault", false, false); + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false); // default value for job_type is defined in pstamptoolConfig.c @@ -531,5 +532,5 @@ } - if (!p_psDBRunQuery(config->dbh, query, req_id, rownum, stateString, job_type, uri, outputBase, fault, argString)) { + if (!p_psDBRunQuery(config->dbh, query, req_id, rownum, stateString, job_type, uri, exp_id, outputBase, fault, argString)) { psError(PS_ERR_UNKNOWN, false, "database error"); return false; @@ -554,6 +555,6 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(req_id, config->args, "-req_id", false, false); - PXOPT_LOOKUP_STR(job_id, config->args, "-job_id", false, false); + PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", false, false); + PXOPT_LOOKUP_S64(job_id, config->args, "-job_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -572,5 +573,5 @@ " *" " FROM pstampJob" - " WHERE req_id = %s", req_id + " WHERE req_id = %" PRId64, req_id ); } else { @@ -579,5 +580,5 @@ " *" " FROM pstampJob" - " WHERE job_id = %s", job_id + " WHERE job_id = %" PRId64, job_id ); } @@ -627,4 +628,5 @@ PXOPT_COPY_S64(config->args, where, "-job_id", "job_id", "=="); + PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -681,9 +683,9 @@ } -static bool processedJobMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - - PXOPT_LOOKUP_STR(job_id, config->args, "-job_id", true, false); +static bool updateJobMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + PXOPT_LOOKUP_S64(job_id, config->args, "-job_id", true, false); PXOPT_LOOKUP_STR(state, config->args, "-state", true, false); PXOPT_LOOKUP_STR(fault, config->args, "-fault", false, false); @@ -698,5 +700,5 @@ char *query ="UPDATE pstampJob" " SET state = '%s' %s" - " WHERE job_id = '%s'"; + " WHERE job_id = %" PRId64; if (!p_psDBRunQuery(config->dbh, query, state, faultStr, job_id)) { Index: trunk/ippTools/src/pstamptool.h =================================================================== --- trunk/ippTools/src/pstamptool.h (revision 19218) +++ trunk/ippTools/src/pstamptool.h (revision 19219) @@ -32,5 +32,5 @@ PSTAMPTOOL_MODE_COMPLETEDREQ, PSTAMPTOOL_MODE_PENDINGREQ, - PSTAMPTOOL_MODE_PROCESSEDREQ, + PSTAMPTOOL_MODE_UPDATEREQ, PSTAMPTOOL_MODE_REVERTREQ, PSTAMPTOOL_MODE_ADDJOB, @@ -38,5 +38,5 @@ PSTAMPTOOL_MODE_PENDINGJOB, PSTAMPTOOL_MODE_JOBRESULT, - PSTAMPTOOL_MODE_PROCESSEDJOB, + PSTAMPTOOL_MODE_UPDATEJOB, } pstamptoolMode; Index: trunk/ippTools/src/pstamptoolConfig.c =================================================================== --- trunk/ippTools/src/pstamptoolConfig.c (revision 19218) +++ trunk/ippTools/src/pstamptoolConfig.c (revision 19219) @@ -52,10 +52,10 @@ // -datastore psMetadata *datastoreArgs = psMetadataAlloc(); - psMetadataAddStr(datastoreArgs, PS_LIST_TAIL, "-ds_id", 0, "define ds_id", NULL); + psMetadataAddS64(datastoreArgs, PS_LIST_TAIL, "-ds_id", 0, "define ds_id", 0); psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -moddatastore psMetadata *moddatastoreArgs = psMetadataAlloc(); - psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-ds_id", 0, "define ds_id", "0"); + psMetadataAddS64(moddatastoreArgs, PS_LIST_TAIL, "-ds_id", 0, "define ds_id", 0); psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0, "define storage uri", NULL); psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-state", 0, "define storage uri", NULL); @@ -64,10 +64,10 @@ psMetadata *addreqArgs = psMetadataAlloc(); psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-uri", 0, "define request file uri", NULL); - psMetadataAddS32(addreqArgs, PS_LIST_TAIL, "-ds_id", 0, "define request ds_id", 0); + psMetadataAddS64(addreqArgs, PS_LIST_TAIL, "-ds_id", 0, "define request ds_id", 0); // psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-out_fileset", 0, "define request output_fileset", NULL); // -pendingreq psMetadata *pendingreqArgs = psMetadataAlloc(); - psMetadataAddStr(pendingreqArgs, PS_LIST_TAIL, "-req_id", 0, "define req_id", NULL); + psMetadataAddS64(pendingreqArgs, PS_LIST_TAIL, "-req_id", 0, "define req_id", 0); psMetadataAddU64(pendingreqArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(pendingreqArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -75,5 +75,5 @@ // -listreq psMetadata *listreqArgs = psMetadataAlloc(); - psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-req_id", 0, "define req_id", NULL); + psMetadataAddS64(listreqArgs, PS_LIST_TAIL, "-req_id", 0, "define req_id", 0); psMetadataAddU64(listreqArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(listreqArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -84,13 +84,13 @@ psMetadataAddBool(completedreqArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - // -processedreq - psMetadata *processedreqArgs = psMetadataAlloc(); - psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-req_id", 0, "req_id for which to change state", NULL); - psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); - psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-outProduct", 0, "define request outProduct", NULL); - psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-fault", 0, "define request fault code", NULL); - psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-uri", 0, "define the uri", NULL); - psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-name", 0, "define the name", NULL); - psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-reqType", 0, "define the reqType", NULL); + // -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); + psMetadataAddStr(updatereqArgs, PS_LIST_TAIL, "-fault", 0, "define request fault code", NULL); + 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); // -revertreq @@ -101,5 +101,5 @@ psMetadata *addjobArgs = psMetadataAlloc(); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-uri", 0, "define job file uri", NULL); - psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-req_id", 0, "define job req_id", NULL); + psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-req_id", 0, "define job req_id", 0); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0, "define job rownum", NULL); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0, "define job job_type", "stamp"); @@ -107,11 +107,11 @@ psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-args", 0, "define job args", NULL); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0, "new state", "run"); - // psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-result", 0, "new result", "0"); + psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-exp_id", 0, "exposure id", 0); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-fault", 0, "new result", NULL); // -listjob psMetadata *listjobArgs = psMetadataAlloc(); - psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-req_id", 0, "define request", NULL); - psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-job_id", 0, "define job", NULL); + psMetadataAddS64(listjobArgs, PS_LIST_TAIL, "-req_id", 0, "define request", 0); + psMetadataAddS64(listjobArgs, PS_LIST_TAIL, "-job_id", 0, "define job", 0); psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -120,13 +120,14 @@ psMetadata *pendingjobArgs = psMetadataAlloc(); psMetadataAddS64(pendingjobArgs, PS_LIST_TAIL, "-job_id", 0, "define job", 0); + psMetadataAddS64(pendingjobArgs, PS_LIST_TAIL, "-req_id", 0, "define request", 0); psMetadataAddU64(pendingjobArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(pendingjobArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - // -processedjob - psMetadata *processedjobArgs = psMetadataAlloc(); - psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-job_id", 0, "req_id for which to change state", NULL); - psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); - // psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-result", 0, "new result", NULL); - psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-fault", 0, "new result", NULL); + // -updatejob + psMetadata *updatejobArgs = psMetadataAlloc(); + psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-job_id", 0, "req_id for which to change state", 0); + psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); + // psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-result", 0, "new result", NULL); + psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-fault", 0, "new result", NULL); psMetadata *argSets = psMetadataAlloc(); @@ -135,5 +136,5 @@ PXOPT_ADD_MODE("-addreq", "", PSTAMPTOOL_MODE_ADDREQ, addreqArgs); PXOPT_ADD_MODE("-pendingreq", "", PSTAMPTOOL_MODE_PENDINGREQ, pendingreqArgs); - PXOPT_ADD_MODE("-processedreq", "", PSTAMPTOOL_MODE_PROCESSEDREQ, processedreqArgs); + PXOPT_ADD_MODE("-updatereq", "", PSTAMPTOOL_MODE_UPDATEREQ, updatereqArgs); PXOPT_ADD_MODE("-listreq", "", PSTAMPTOOL_MODE_LISTREQ, listreqArgs); PXOPT_ADD_MODE("-completedreq", "", PSTAMPTOOL_MODE_COMPLETEDREQ, completedreqArgs); @@ -143,5 +144,5 @@ PXOPT_ADD_MODE("-listjob", "", PSTAMPTOOL_MODE_LISTJOB, listjobArgs); PXOPT_ADD_MODE("-pendingjob", "", PSTAMPTOOL_MODE_PENDINGJOB, pendingjobArgs); - PXOPT_ADD_MODE("-processedjob", "", PSTAMPTOOL_MODE_PROCESSEDJOB, processedjobArgs); + PXOPT_ADD_MODE("-updatejob", "", PSTAMPTOOL_MODE_UPDATEJOB, updatejobArgs); PXOPT_ADD_MODE("-adddatastore", "", PSTAMPTOOL_MODE_ADDDATASTORE, adddatastoreArgs);