Index: trunk/ippTools/src/pstamptoolConfig.c
===================================================================
--- trunk/ippTools/src/pstamptoolConfig.c	(revision 18531)
+++ trunk/ippTools/src/pstamptoolConfig.c	(revision 18561)
@@ -45,152 +45,88 @@
     // -adddatastore
     psMetadata *adddatastoreArgs = psMetadataAlloc();
-    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri", 0,
-            "define storage uri", NULL);
-    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0,
-            "define last fileset seen", NULL);
-    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-state", 0,
-            "define datastore state", NULL);
-    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-out_product", 0,
-            "define output product name", NULL);
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri",          0, "define storage uri (required)", NULL);
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-out_product",  0, "define output product name (required)", NULL);
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0, "define last fileset seen", NULL);
+    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-state",        0, "define datastore state", "enabled");
     
     // -datastore
     psMetadata *datastoreArgs = psMetadataAlloc();
-    psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0,
-            "use the simple output format", false);
-    psMetadataAddStr(datastoreArgs, PS_LIST_TAIL, "-ds_id", 0,
-            "define ds_id", NULL); 
+    psMetadataAddStr(datastoreArgs, PS_LIST_TAIL, "-ds_id", 0,            "define ds_id", NULL); 
+    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", NULL); 
-    psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0,
-            "define storage uri", NULL);
-    psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-state", 0,
-            "define storage uri", NULL);
-    psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-out_product", 0,
-            "define output product name", NULL);
-
+    psMetadataAddStr(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);
 
     // -addreq
     psMetadata *addreqArgs = psMetadataAlloc();
-    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-uri", 0,
-            "define request file uri", NULL); 
-    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-ds_id", 0,
-            "define request ds_id", NULL); 
+    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-uri", 0,            "define request file uri", NULL); 
+    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-ds_id", 0,            "define request ds_id", NULL); 
+    // 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); 
-    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);
+    psMetadataAddStr(pendingreqArgs, PS_LIST_TAIL, "-req_id", 0,            "define req_id", NULL); 
+    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);
 
     // -listreq
     psMetadata *listreqArgs = psMetadataAlloc();
-    psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-req_id", 0,
-            "define req_id", NULL); 
-    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);
+    psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-req_id", 0,            "define req_id", NULL); 
+    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);
 
     // -completedreq
     psMetadata *completedreqArgs = psMetadataAlloc();
-    psMetadataAddU64(completedreqArgs, PS_LIST_TAIL, "-limit",  0,
-            "limit result set to N items", 0);
-    psMetadataAddBool(completedreqArgs, PS_LIST_TAIL, "-simple", 0,
-            "use the simple output format", false);
+    psMetadataAddU64(completedreqArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
+    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); 
+    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); 
 
     // -revertreq
     psMetadata *revertreqArgs = psMetadataAlloc();
-    psMetadataAddS64(revertreqArgs, PS_LIST_TAIL, "-req_id", 0,
-            "req_id for which to revert", 0); 
+    psMetadataAddS64(revertreqArgs, PS_LIST_TAIL, "-req_id", 0,            "req_id for which to revert", 0); 
 
     // -addjob
     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); 
-    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0,
-            "define job rownum", NULL); 
-    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,
-            "define job job_type", NULL); 
-    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,
-            "define job outputBase", NULL); 
-    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-args", 0,
-            "define job args", NULL); 
-    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0,
-            "new state", NULL); 
-    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-fault", 0,
-            "new result", NULL); 
+    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); 
+    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0,            "define job rownum", NULL); 
+    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,            "define job job_type", "stamp"); 
+    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,            "define job outputBase", NULL); 
+    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"); 
+    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); 
-    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);
+    psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-req_id", 0,            "define request", NULL); 
+    psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-job_id", 0,            "define job", NULL); 
+    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);
 
     // -pendingjob
     psMetadata *pendingjobArgs = psMetadataAlloc();
-    psMetadataAddStr(pendingjobArgs, PS_LIST_TAIL, "-job_id", 0,
-            "define job", NULL); 
-    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);
+    psMetadataAddStr(pendingjobArgs, PS_LIST_TAIL, "-job_id", 0,            "define job", NULL); 
+    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, "-fault", 0,
-            "new result", NULL); 
-
-#define PXTOOL_MODE(option, modeval, argset) \
-{ \
-    int N = 0; \
-    if ((N = psArgumentGet (argc, argv, option))) { \
-        psArgumentRemove (N, &argc, argv); \
-        if (config->mode) { \
-            psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \
-            psFree(config); \
-            return NULL; \
-        } \
-        config->mode = modeval; \
-        config->args = psMemIncrRefCounter(argset); \
-    } \
-    if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\
-        psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \
-    } \
-    psFree(argset); \
-}
+    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); 
 
     psMetadata *argSets = psMetadataAlloc();
@@ -224,29 +160,4 @@
     psFree(modes);
 
-    // setup search criterion
-#define addWhereStr(name) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-    // generate SQL where clause
-    config->where = psMetadataAlloc();
-
-    addWhereStr(req_id); 
-    addWhereStr(job_id); 
-
-    if (config->where->list->n < 1) {
-        psFree(config->where);
-        config->where = NULL;
-    }
-
     // define Database handle, if used
     // do this last so we don't setup a connection before CLI options are