Index: /trunk/ippTools/src/warptoolConfig.c
===================================================================
--- /trunk/ippTools/src/warptoolConfig.c	(revision 10750)
+++ /trunk/ippTools/src/warptoolConfig.c	(revision 10751)
@@ -84,4 +84,6 @@
     psMetadataAddStr(towarpedimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
             "search by p4 ID", NULL);
+    psMetadataAddBool(towarpedimfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
  
     // -addwarpedimfile
@@ -106,4 +108,6 @@
     psMetadataAddStr(warpedimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
             "search by p4 ID", NULL);
+    psMetadataAddBool(warpedimfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
 
     // -tostackedimfile
@@ -111,4 +115,6 @@
     psMetadataAddStr(tostackedimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
             "search by p4 ID", NULL);
+    psMetadataAddBool(tostackedimfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
 
     // -addstackedimfile
@@ -133,4 +139,6 @@
     psMetadataAddStr(stackedimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
             "search by p4 ID", NULL);
+    psMetadataAddBool(stackedimfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
  
     // -todiffimfile
@@ -138,4 +146,6 @@
     psMetadataAddStr(todiffimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
             "search by p4 ID", NULL);
+    psMetadataAddBool(todiffimfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
  
     // -adddiffimfile
@@ -160,4 +170,6 @@
     psMetadataAddStr(diffimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
             "search by p4 ID", NULL);
+    psMetadataAddBool(diffimfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
 
     psFree(now);
@@ -240,68 +252,21 @@
 }
 
+#define addWhereS32(name) \
+{ \
+    psS32 s32 = 0; \
+    bool status = false; \
+    if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+            goto FAIL; \
+        } \
+    } \
+}
+
+
     // generate SQL where clause
     config->where = psMetadataAlloc();
 
-    addWhereStr(det_id);
-    {
-        int n = 0;
-        bool status = false;
-        if ((n = psMetadataLookupS32(&status, config->args, "-iteration"))) {
-            if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "iteration", 0, "==", n)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
-                goto FAIL;
-            }
-        }
-    }
-    addWhereStr(det_type);
-    addWhereStr(exp_tag);
-    addWhereStr(class_id);
-    // convert '-inst' to 'camera'
-    {
-        psString str = NULL;
-        bool status = false;
-        if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) {
-            if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
-                goto FAIL;
-            }
-        }
-    }
-    addWhereStr(telescope);
-    addWhereStr(exp_type);
-    {
-        int n = 0;
-        bool status = false;
-        if ((n = psMetadataLookupS32(&status, config->args, "-imfiles"))) {
-            if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
-                goto FAIL;
-            }
-        }
-    }
-    addWhereStr(filter);
-    addWhereStr(recipe);
-    {
-        int n = 0;
-        bool status = false;
-        if ((n = psMetadataLookupS32(&status, config->args, "-p1_version"))) {
-            if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
-                goto FAIL;
-            }
-        }
-    }
-    {
-        bool boolean = false;
-        bool status = false;
-
-        // map reject -> !accept
-        if ((boolean = psMetadataLookupBool(&status, config->args, "-reject"))) {
-            if (!psMetadataAddBool(config->where, PS_LIST_TAIL, "accept", 0, "==", !boolean)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item reject");
-                goto FAIL;
-            }
-        }
-    }
+    addWhereS32(p4_id);
 
     if (config->where->list->n < 1) {