Changeset 19489

Timestamp:

Sep 11, 2008, 11:06:34 AM (18 years ago)

Author:

Paul Price

Message:

Adding search on label to faketool -updaterun

Location:

trunk/ippTools/src

Files:

• faketool.c (modified) (2 diffs)
• faketoolConfig.c (modified) (1 diff)
• pxfake.c (modified) (2 diffs)

trunk/ippTools/src/faketool.c

@@ -295 +295 @@
     PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">=");
     PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<");
+    PXOPT_COPY_STR(config->args, where, "-label", "fakeRun.label", "==");
 
     if (!psListLength(where->list)
@@ -304 +305 @@
     }
 
-    PXOPT_LOOKUP_STR(state, config->args, "-state", false, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-set-state", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set-label", false, false);
 
     if ((!state) && (!label)) {

trunk/ippTools/src/faketoolConfig.c

@@ -139 +139 @@
     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min",  0,            "define min solar angle", NAN);
     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max",  0,            "define max solar angle", NAN);
-
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,            "set state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0,            "set label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
+
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-state", 0,            "set state", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-label", 0,            "set label", NULL);
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
 

trunk/ippTools/src/pxfake.c

@@ -68 +68 @@
     if (where) {
         psString whereClause = psDBGenerateWhereSQL(where, NULL);
-        psStringAppend(&query, " %s", whereClause);
+        psStringAppend(&query, " WHERE %s", whereClause);
         psFree(whereClause);
     }
@@ -109 +109 @@
     if (where) {
         psString whereClause = psDBGenerateWhereSQL(where, NULL);
-        psStringAppend(&query, " %s", whereClause);
+        psStringAppend(&query, " WHERE %s", whereClause);
         psFree(whereClause);
     }