Changeset 25051 for branches/czw_branch/cleanup/ippTools/src/pstamptool.c

Timestamp:

Aug 11, 2009, 3:54:00 PM (17 years ago)

Author:

watersc1

Message:

Bringing branch up-to-date at revision 25049

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• ippTools/src/pstamptool.c (modified) (3 diffs)

branches/czw_branch/cleanup/ippTools/src/pstamptool.c

@@ -500 +500 @@
     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 +517 @@
         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 +527 @@
     }
 
-    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;