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

Timestamp:

Aug 20, 2009, 11:48:09 AM (17 years ago)

Author:

watersc1

Message:

 

File:

• branches/czw_branch/cleanup/ippTools/src/pstamptool.c (modified) (5 diffs)

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

@@ -315 +315 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S64(req_id,  config->args, "-req_id", true, false);
+    psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-name", "name", "==");
+
     PXOPT_LOOKUP_U64(limit,   config->args, "-limit",  false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
-    psString query = NULL;
-    psStringAppend(&query, "SELECT * from pstampRequest WHERE req_id = %" PRId64, req_id);
+    if (!psListLength(where->list)) {
+        psError(PS_ERR_UNKNOWN, true, "-req_id or -name must be supplied");
+        return false;
+    }
+
+    psString query = psStringCopy("SELECT * from pstampRequest");
+
+    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringAppend(&query, " WHERE %s", whereClause);
+    psFree(whereClause);
+    psFree(where);
     
     // treat limit == 0 as "no limit"
@@ -342 +354 @@
     }
     if (!psArrayLength(output)) {
-        psTrace("pstamptool", PS_LOG_INFO, "no rows found");
-        psFree(output);
-        return true;
+        psTrace("pstamptool", PS_LOG_INFO, "request not found");
+        // This causes main to exit with PS_EXIT_DATA_ERROR which the script is looking for
+        psError(PXTOOLS_ERR_DATA, true, "request not found");
+        psFree(output);
+        // we return false so that the caller can determine that a request does not exist
+        return false;
     }
 
@@ -496 +511 @@
 {
     bool    stampJob = false;
-    char   *query = NULL;
 
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -503 +517 @@
     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
-    if (!strcmp(job_type, "get_image") || !strcmp(job_type, "detect_query")) {
+    if (!strcmp(job_type, "get_image") || !strcmp(job_type, "detect_query") || !strcmp(job_type, "none")) {
         stampJob = false;
     } else if (!strcmp(job_type, "stamp")) {
@@ -517 +537 @@
         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;