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

Timestamp:

Aug 20, 2009, 12:42:13 PM (17 years ago)

Author:

watersc1

Message:

More merging

Location:

branches/czw_branch/cleanup

Files:

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

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

@@ -315 +315 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-name", "name", "==");
-
+    PXOPT_LOOKUP_S64(req_id,  config->args, "-req_id", false, false);
+    PXOPT_LOOKUP_STR(name,  config->args, "-name", false, false);
     PXOPT_LOOKUP_U64(limit,   config->args, "-limit",  false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
-    if (!psListLength(where->list)) {
+    if (!req_id && !name) {
         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);
+    psString query = NULL;
+    psStringAppend(&query, "SELECT * from pstampRequest WHERE req_id = %" PRId64, req_id);
     
     // treat limit == 0 as "no limit"
@@ -529 +523 @@
 
     // default value for job_type is defined in pstamptoolConfig.c
-    if (!strcmp(job_type, "get_image") || !strcmp(job_type, "detect_query") || !strcmp(job_type, "none")) {
+    if (!strcmp(job_type, "get_image") || !strcmp(job_type, "detect_query")) {
         stampJob = false;
     } else if (!strcmp(job_type, "stamp")) {