Index: branches/pap/ippTools/src/pstamptool.c
===================================================================
--- branches/pap/ippTools/src/pstamptool.c	(revision 23948)
+++ branches/pap/ippTools/src/pstamptool.c	(revision 25027)
@@ -34,17 +34,17 @@
 static bool datastoreMode(pxConfig *config);
 static bool moddatastoreMode(pxConfig *config);
-static bool addReqMode(pxConfig *config);
-static bool completedReqMode(pxConfig *config);
-static bool listReqMode(pxConfig *config);
-static bool pendingReqMode(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 updateJobMode(pxConfig *config);
-static bool addProjectMode(pxConfig *config);
+static bool addreqMode(pxConfig *config);
+static bool completedreqMode(pxConfig *config);
+static bool listreqMode(pxConfig *config);
+static bool pendingreqMode(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 updatejobMode(pxConfig *config);
+static bool addprojectMode(pxConfig *config);
 static bool projectMode(pxConfig *config);
-static bool modProjectMode(pxConfig *config);
+static bool modprojectMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -70,16 +70,16 @@
         MODECASE(PSTAMPTOOL_MODE_DATASTORE, datastoreMode);
         MODECASE(PSTAMPTOOL_MODE_MODDATASTORE, moddatastoreMode);
-        MODECASE(PSTAMPTOOL_MODE_ADDREQ, addReqMode);
-        MODECASE(PSTAMPTOOL_MODE_COMPLETEDREQ, completedReqMode);
-        MODECASE(PSTAMPTOOL_MODE_LISTREQ, listReqMode);
-        MODECASE(PSTAMPTOOL_MODE_PENDINGREQ, pendingReqMode);
-        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_UPDATEJOB, updateJobMode);
-        MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addProjectMode);
-        MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modProjectMode);
+        MODECASE(PSTAMPTOOL_MODE_ADDREQ, addreqMode);
+        MODECASE(PSTAMPTOOL_MODE_COMPLETEDREQ, completedreqMode);
+        MODECASE(PSTAMPTOOL_MODE_LISTREQ, listreqMode);
+        MODECASE(PSTAMPTOOL_MODE_PENDINGREQ, pendingreqMode);
+        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_UPDATEJOB, updatejobMode);
+        MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode);
+        MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode);
         MODECASE(PSTAMPTOOL_MODE_PROJECT, projectMode);
         default:
@@ -220,5 +220,5 @@
 }
 
-static bool addReqMode(pxConfig *config)
+static bool addreqMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -251,5 +251,5 @@
 }
 
-static bool pendingReqMode(pxConfig *config)
+static bool pendingreqMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -311,5 +311,5 @@
 }
 
-static bool listReqMode(pxConfig *config)
+static bool listreqMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -359,5 +359,5 @@
 }
 
-static bool completedReqMode(pxConfig *config)
+static bool completedreqMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -408,5 +408,5 @@
 }
 
-static bool updateReqMode(pxConfig *config)
+static bool updatereqMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -472,5 +472,5 @@
 }
 
-static bool revertReqMode(pxConfig *config)
+static bool revertreqMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -493,5 +493,5 @@
 }
 
-static bool addJobMode(pxConfig *config)
+static bool addjobMode(pxConfig *config)
 {
     bool    stampJob = false;
@@ -500,10 +500,8 @@
     PS_ASSERT_PTR_NON_NULL(config, 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);
     PXOPT_LOOKUP_STR(outputBase,  config->args, "-outputBase", true,  false);
-    PXOPT_LOOKUP_STR(argString,   config->args, "-args",       false, false);
     PXOPT_LOOKUP_STR(stateString, config->args, "-state",      false, false);
     PXOPT_LOOKUP_STR(fault,       config->args, "-fault",      false, false);
@@ -519,10 +517,4 @@
 	return false;
     }
-
-    if (stampJob && !argString) {
-	psError(PS_ERR_UNKNOWN, true, "-args is required for stamp job");
-	return false;
-    }
-
     if (stampJob) {
 	query = pxDataGet("pstamptool_addjob_stampjob.sql");
@@ -535,5 +527,5 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, req_id, rownum, stateString, job_type, uri, exp_id, outputBase, fault, argString)) {
+    if (!p_psDBRunQueryF(config->dbh, query, req_id, rownum, stateString, job_type, exp_id, outputBase, fault)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -554,5 +546,5 @@
 }
 
-static bool listJobMode(pxConfig *config)
+static bool listjobMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -626,5 +618,5 @@
 }
 
-static bool pendingJobMode(pxConfig *config)
+static bool pendingjobMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -688,5 +680,5 @@
 }
 
-static bool updateJobMode(pxConfig *config)
+static bool updatejobMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -723,5 +715,5 @@
     return true;
 }
-static bool addProjectMode(pxConfig *config)
+static bool addprojectMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -801,5 +793,5 @@
     return true;
 }
-static bool modProjectMode(pxConfig *config)
+static bool modprojectMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);