Changeset 26095

Timestamp:

Nov 10, 2009, 2:41:25 PM (16 years ago)

Author:

bills

Message:

allow -all to -pendingcleanup

Location:

trunk/ippTools/src

Files:

• disttool.c (modified) (1 diff)
• disttoolConfig.c (modified) (1 diff)

trunk/ippTools/src/disttool.c

@@ -1734 +1734 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-
-    if (!psListLength(where->list)) {
-        psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
-        return false;
-    }
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
     psString query = pxDataGet("disttool_pendingcleanup.sql");
 
-    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-    psStringAppend(&query, " AND %s", whereClause);
-    psFree(whereClause);
-    psFree(where);
+    if (psListLength(where->list)) {
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+        psFree(where);
+    } else if (!all) {
+        psFree(where);
+        psError(PXTOOLS_ERR_DATA, false, "search parameters or -all are required");
+        return false;
+    }
 
     // treat limit == 0 as "no limit"

trunk/ippTools/src/disttoolConfig.c

@@ -101 +101 @@
     psMetadataAddU64(pendingcleanupArgs, PS_LIST_TAIL, "-limit",  0,  "limit result set to N items", 0);
     psMetadataAddBool(pendingcleanupArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
+    psMetadataAddBool(pendingcleanupArgs, PS_LIST_TAIL, "-all",    0, "list all runs pending cleanup", NULL);