Index: trunk/ippTools/src/pstamptool.c
===================================================================
--- trunk/ippTools/src/pstamptool.c	(revision 18974)
+++ 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)) {