Changeset 27182

Timestamp:

Mar 3, 2010, 5:49:21 PM (16 years ago)

Author:

bills

Message:

add labels to the revert modes

Location:

trunk/ippTools/src

Files:

• pstamptool.c (modified) (3 diffs)
• pstamptoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/pstamptool.c

@@ -526 +526 @@
     PXOPT_COPY_S64(config->args, where, "-fault", "req_id", "==");
     PXOPT_COPY_STR(config->args, where, "-state", "pstampRequest.state", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "LIKE");
 
     if (!psListLength(where->list)) {
@@ -798 +799 @@
     PXOPT_COPY_S64(config->args, where, "-job_id", "job_id", "==");
     PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-fault",  "fault", "==");
+    PXOPT_COPY_S64(config->args, where, "-fault",  "pstampJob.fault", "==");
     PXOPT_COPY_S64(config->args, where, "-req_id_min",  "req_id", ">=");
+    pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "LIKE");
 
     PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
@@ -820 +822 @@
     }
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "pstampJob");
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);

trunk/ippTools/src/pstamptoolConfig.c

@@ -110 +110 @@
     psMetadataAddS16(revertreqArgs, PS_LIST_TAIL, "-fault",  0,     "fault to revert", 0);
     psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-state", 0,      "state to revert", NULL);
+    psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by pstampRequest label (LIKE comparision)", NULL);
 
     // -addjob
@@ -151 +152 @@
     psMetadataAddS64(revertjobArgs, PS_LIST_TAIL, "-job_id", 0,     "job_id to revert", 0);
     psMetadataAddS16(revertjobArgs, PS_LIST_TAIL, "-fault",  0,     "fault to revert", 0);
+    psMetadataAddStr(revertjobArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by pstampRequest label (LIKE comparision)", NULL);
     psMetadataAddBool(revertjobArgs, PS_LIST_TAIL, "-all", 0,       "revert all faulted jobs", false);
     psMetadataAddU64(revertjobArgs, PS_LIST_TAIL, "-limit", 0,      "limit result set to N items", 0);