Changeset 25624 for branches/eam_branches/20090715/ippTools/src/pstamptool.c

Timestamp:

Sep 27, 2009, 11:34:07 AM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/20090715/ippTools/src/pstamptool.c (modified) (3 diffs)

branches/eam_branches/20090715/ippTools/src/pstamptool.c

@@ -228 +228 @@
     PXOPT_LOOKUP_STR(uri,         config->args, "-uri",   true, false);
     PXOPT_LOOKUP_STR(name,        config->args, "-name",  false, false);
+    PXOPT_LOOKUP_STR(label,       config->args, "-label",  false, false);
     PXOPT_LOOKUP_S64(ds_id,       config->args, "-ds_id", false, false);
 
@@ -236 +237 @@
         name,
         NULL,   // reqType
+        label,
         NULL,   // outProduct
         uri,    
@@ -765 +767 @@
     PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
     PXOPT_COPY_S64(config->args, where, "-fault",  "fault", "==");
-
-    if (!psListLength(where->list)) {
+    PXOPT_COPY_S64(config->args, where, "-req_id_min",  "req_id", ">=");
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+
+    psString query = pxDataGet("pstamptool_revertjob.sql");
+    if (!psListLength(where->list) && !all) {
         psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
-        return false;
-    }
-
-    psString query = pxDataGet("pstamptool_revertjob.sql");
-    psString whereClause = psDBGenerateWhereConditionSQL(where, "pstampJob");
-    psStringAppend(&query, " AND %s", whereClause);
-    psFree(whereClause);
+        psError(PXTOOLS_ERR_DATA, false, "search parameters or -all are required");
+        return false;
+    }
+    if (psListLength(where->list)) {
+        psString whereClause = psDBGenerateWhereConditionSQL(where, "pstampJob");
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
     psFree(where);