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

Timestamp:

Aug 14, 2009, 12:45:30 PM (17 years ago)

Author:

bills

Message:

New error codes for postage stamp server requests and jobs

File:

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

trunk/ippTools/src/pstamptool.c

@@ -315 +315 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S64(req_id,  config->args, "-req_id", true, false);
+    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 (!req_id && !name) {
+        psError(PS_ERR_UNKNOWN, true, "-req_id or -name must be supplied");
+        return false;
+    }
 
     psString query = NULL;
@@ -342 +348 @@
     }
     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;
     }