Changeset 23614

Timestamp:

Mar 30, 2009, 2:53:54 PM (17 years ago)

Author:

eugene

Message:

add -all requirement to -processedimfile

File:

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

trunk/ippTools/src/chiptool.c

@@ -242 +242 @@
     PXOPT_COPY_STR(config->args,  where, "-state",   "chipRun.state",   "==");
 
-    if (!psListLength(where->list)
-        && !psMetadataLookupBool(NULL, config->args, "-all")) {
+    if (!psListLength(where->list) && 
+        !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
         where = NULL;
@@ -542 +542 @@
     PXOPT_COPY_STR(config->args, where, "-label", "chipRun.label", "LIKE");
     PXOPT_COPY_S32(config->args, where, "-magicked", "chipRun.magicked", "==");
+
+    if (!psListLength(where->list) && 
+        !psMetadataLookupBool(NULL, config->args, "-all")) {
+        psFree(where);
+        psError(PXTOOLS_ERR_DATA, false, "search parameters (or -all) are required");
+        return false;
+    }
 
     psString query = pxDataGet("chiptool_processedimfile.sql");