Changeset 18618

Timestamp:

Jul 18, 2008, 12:20:51 PM (18 years ago)

Author:

Paul Price

Message:

Fixing -template for -inputskyfile, and adding -input

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (2 diffs)
• difftoolConfig.c (modified) (1 diff)

trunk/ippTools/src/difftool.c

@@ -293 +293 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_BOOL(template, config->args, "-template", false);
+    PXOPT_LOOKUP_BOOL(input, config->args, "-input", false);
+
+    if (template && input) {
+        // User apparently wants both, which is the default behaviour
+        template = false;
+        input = false;
+    }
 
     // find all rawImfiles matching the default query
@@ -301 +308 @@
     }
 
-    if (template) {
-        // list only faulted rows
-        psStringAppend(&query, " %s", "WHERE template != 0");
-    } else {
-        // don't list faulted rows
-        psStringAppend(&query, " %s", "WHERE template = 0");
-    }
-
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
+        psStringAppend(&query, " WHERE %s", whereClause);
         psFree(whereClause);
     }
+
+    // Add condition to get only templates or only inputs
+    {
+        psString whereClause = NULL;
+        if (template) {
+            psStringAppend(&whereClause, " %s", " template != 0");
+        } else if (input) {
+            psStringAppend(&whereClause, " %s", " template = 0");
+        }
+        if (whereClause) {
+            psStringAppend(&query, " %s %s", psListLength(where->list) ? "AND" : "WHERE", whereClause);
+        }
+        psFree(whereClause);
+    }
+
     psFree(where);
 

trunk/ippTools/src/difftoolConfig.c

@@ -73 +73 @@
     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-tess_id", 0,            "search by tess ID", NULL);
     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-kind", 0,            "search by kind", NULL);
-    psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-template",  0,            "search by subtrahend", false);
+    psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-template",  0,            "find only subtrahend", false);
+    psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-input", 0, "find only minuend", false);
     psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);