Changeset 26925

Timestamp:

Feb 12, 2010, 12:06:23 PM (16 years ago)

Author:

bills

Message:

in -updatrun allow selection by dist_group and data_group

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/disttool.c

@@ -428 +428 @@
     PXOPT_COPY_S64(config->args, where, "-dist_id", "dist_id", "==");
     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");;
-    PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
+    PXOPT_COPY_STR(config->args, where, "-state", "distRun.state", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_STR(config->args, where, "-data_group", "distRun.data_group", "==");
+    PXOPT_COPY_STR(config->args, where, "-dist_group", "distTarget.dist_group", "==");
     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
@@ -448 +451 @@
     }
 
-    psString query = psStringCopy("UPDATE distRun SET time_stamp = UTC_TIMESTAMP()");
+    psString query = psStringCopy("UPDATE distRun join distTarget using(target_id, stage) SET distRun.time_stamp = UTC_TIMESTAMP()");
 
     if (outdir) {
-        psStringAppend(&query, " , outdir = '%s'", outdir);
+        psStringAppend(&query, " , distRun.outdir = '%s'", outdir);
     }
     if (state) {
-        psStringAppend(&query, " , state = '%s'", state);
+        psStringAppend(&query, " , distRun.state = '%s'", state);
     }
 
     if (label) {
-        psStringAppend(&query, " , label = '%s'", label);
+        psStringAppend(&query, " , distRun.label = '%s'", label);
     }
 
     if (fault) {
-        psStringAppend(&query, " , fault = %d", fault);
+        psStringAppend(&query, " , distRun.fault = %d", fault);
     }
 

trunk/ippTools/src/disttoolConfig.c

@@ -74 +74 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state",     0, "value for state", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label",     0, "limit updates to label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group",     0, "limit updates to data_group", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dist_group",     0, "limit updates to data_group", NULL);
     psMetadataAddS16(updaterunArgs, PS_LIST_TAIL, "-fault",      0, "define fault code", 0);