Changeset 19389 for trunk/ippTools

Timestamp:

Sep 5, 2008, 11:01:49 AM (18 years ago)

Author:

bills

Message:

For -definebyquery fix the check for an empty where list to account for
-exp_type object being added by default.
For other modes remove that default

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (3 diffs)
• chiptoolConfig.c (modified) (1 diff)

trunk/ippTools/src/chiptool.c

@@ -123 +123 @@
     PXOPT_COPY_STR(config->args, where, "-label", "rawExp.label", "LIKE");
 
-    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
+    // psListLength(where->list) is at least 1 because exp_type defaults to "object"
+    // so we require a list longer than 1 entry
+    if ((psListLength(where->list) <= 1) && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
@@ -138 +140 @@
 
     // default
-    PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "==");
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -150 +151 @@
     }
 
-    if (where && psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp");
-        psStringAppend(&query, " AND %s", whereClause);
-        psFree(whereClause);
-    }
+    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringAppend(&query, " AND %s", whereClause);
+    
+    psFree(whereClause);
     psFree(where);
 

trunk/ippTools/src/chiptoolConfig.c

@@ -48 +48 @@
     pxchipSetSearchArgs (definebyqueryArgs);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label",              0, "search by rawExp label (LIKE comparison)", NULL);
+
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type",          PS_META_REPLACE, "search by exp_type", "object");
 
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",  0,            "define workdir", NULL);