Changeset 29202

Timestamp:

Sep 22, 2010, 3:14:33 PM (16 years ago)

Author:

bills

Message:

various updates from trunk

Location:

tags/ipp-20100823/ippTools/src

Files:

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

tags/ipp-20100823/ippTools/src/difftool.c

@@ -2868 +2868 @@
     pxAddLabelSearchArgs (config, where, "-data_group", "diffRun.data_group", "LIKE");
     pxAddLabelSearchArgs (config, where, "-dist_group", "diffRun.dist_group", "LIKE");
-
+    
     PXOPT_LOOKUP_BOOL(template, config->args, "-template", false);
     if (!template) {
@@ -2890 +2890 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_BOOL(pstamp_order, config->args, "-pstamp_order", false);
-
+    PXOPT_LOOKUP_S16(diff_mode, config->args, "-diff_mode", false, false);
+    if (diff_mode) {
+      PXOPT_COPY_S16(config->args, where, "-diff_mode", "diffRun.diff_mode", "==");
+    }
 
     psString where2 = NULL;

tags/ipp-20100823/ippTools/src/difftoolConfig.c

@@ -184 +184 @@
     psMetadataAddStr(listrunArgs,  PS_LIST_TAIL, "-data_group",  PS_META_DUPLICATE_OK, "search by diffRun data_group (LIKE comparison)", NULL);
     psMetadataAddStr(listrunArgs,  PS_LIST_TAIL, "-dist_group",  PS_META_DUPLICATE_OK, "search by diffRun dist_group (LIKE comparison)", NULL);
+    psMetadataAddS16(listrunArgs,  PS_LIST_TAIL, "-diff_mode", 0,        "search for diff_mode", 0);
     pxmagicAddArguments(listrunArgs);
     pxspaceAddArguments(listrunArgs);

tags/ipp-20100823/ippTools/src/disttool.c

@@ -519 +519 @@
     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");;
     PXOPT_COPY_STR(config->args, where, "-state", "distRun.state", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-data_group", "distRun.data_group", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-dist_group", "distTarget.dist_group", "==");

tags/ipp-20100823/ippTools/src/disttoolConfig.c

@@ -76 +76 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stage",     0, "value for stage", NULL);
     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, "-label",     0, "limit updates to label (LIKE comparison)", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group",     0, "limit updates to data_group (LIKE comparison)", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dist_group",     0, "limit updates to data_group", NULL);
     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-time_stamp_begin", 0, "limit updates by time_stamp (>=)", NULL); 

tags/ipp-20100823/ippTools/src/staticskytool.c

@@ -290 +290 @@
                                 workdir,
                                 label,
-                                data_group,
+                                data_group ? data_group : label,
                                 dist_group,
                                 reduction,