Changeset 25790

Timestamp:

Oct 7, 2009, 9:32:20 AM (17 years ago)

Author:

bills

Message:

fix bugs in testing for presence of search arguments

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (1 diff)
• difftool.c (modified) (1 diff)

trunk/ippTools/src/chiptool.c

@@ -623 +623 @@
         psStringAppend(&query, " WHERE %s", whereClause);
         psFree(whereClause);
-    } else if (!psMetadataLookupBool(NULL, config->args, "-all") && (faulted || where2)) {
-        psStringAppend(&query, " WHERE chipRun.chip_id IS NOT NULL %s", where2);
+    } else if (psMetadataLookupBool(NULL, config->args, "-all") || (faulted || where2)) {
+        psStringAppend(&query, " WHERE chipRun.chip_id IS NOT NULL %s", where2 ? where2 : "");
     } else {
         psFree(where);

trunk/ippTools/src/difftool.c

@@ -706 +706 @@
         psStringAppend(&query, " WHERE %s", whereClause);
         psFree(whereClause);
-    } else if (all) {
-        if (where2) {
-            psStringAppend(&query, " WHERE diffRun.diff_id is not null %s", where2);
-        }
-    } else {
+    } else if (where2) {
+        psStringAppend(&query, " WHERE diffRun.diff_id is not null %s", where2);
+    } else if (!all) {
         psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
         return false;