Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 40512)
+++ trunk/ippTools/src/warptool.c	(revision 41549)
@@ -602,4 +602,5 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
     // find all rawImfiles matching the default query
@@ -614,4 +615,9 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
+    } else {
+      if (!all) {
+        psError(PXTOOLS_ERR_SYS, false, "unrestricted query not allowed (try -all)");
+        return false;
+      }
     }
     psFree(where);
@@ -930,4 +936,5 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
     // First find Label's with warpRuns in state new in priority order
@@ -945,4 +952,9 @@
         psStringAppend(&labelWhereStr, "\n AND %s", whereClause);
         psFree(whereClause);
+    } else {
+      if (!all) {
+        psError(PXTOOLS_ERR_SYS, false, "unrestricted query not allowed (try -all)");
+        return false;
+      }
     }
     psFree(labelWhere);
@@ -1645,4 +1657,7 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
   
+  PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  
   psMetadata *where = psMetadataAlloc();
   PXOPT_COPY_S64(config->args, where, "-warp_id",    "warpSkyfile.warp_id", "==");
@@ -1661,7 +1676,4 @@
   PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
-  PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
-  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-  
   // find all rawImfiles matching the default query
   psString query = pxDataGet("warptool_tosummary.sql");