Changeset 25054 for trunk/ippTools/src/pstamptool.c

Timestamp:

Aug 11, 2009, 4:15:20 PM (17 years ago)

Author:

bills

Message:

support for fake jobs

File:

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

trunk/ippTools/src/pstamptool.c

@@ -496 +496 @@
 {
     bool    stampJob = false;
-    char   *query = NULL;
 
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -503 +502 @@
     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(outputBase,  config->args, "-outputBase", false,  false);
     PXOPT_LOOKUP_STR(stateString, config->args, "-state",      false, false);
-    PXOPT_LOOKUP_STR(fault,       config->args, "-fault",      false, false);
+    PXOPT_LOOKUP_S16(fault,       config->args, "-fault",      false, false);
     PXOPT_LOOKUP_S64(exp_id,      config->args, "-exp_id",     false, false);
+
+    // unless the job is being inserted with stop state require outputBase
+    if (strcmp(stateString, "stop") && !outputBase) {
+        psError(PS_ERR_UNKNOWN, true, "-outputBase is required");
+        return false;
+    }
 
     // default value for job_type is defined in pstamptoolConfig.c
@@ -517 +522 @@
         return false;
     }
-    if (stampJob) {
-        query = pxDataGet("pstamptool_addjob_stampjob.sql");
-    } else {
-        query = pxDataGet("pstamptool_addjob_otherjob.sql");
-    }
-    if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-        return false;
-    }
-
-    if (!p_psDBRunQueryF(config->dbh, query, req_id, rownum, stateString, job_type, exp_id, outputBase, fault)) {
+    if (!pstampJobInsert(config->dbh, 
+            0, // job_id
+            req_id,
+            rownum, 
+            stateString, 
+            job_type, 
+            fault, 
+            exp_id, 
+            outputBase
+            )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;