Changeset 26984 for trunk/ippTools/src/difftool.c

Timestamp:

Feb 18, 2010, 11:36:46 AM (16 years ago)

Author:

Paul Price

Message:

Making revert for dist, diff, stack obey the convention of allowing multiple labels.

File:

• trunk/ippTools/src/difftool.c (modified) (2 diffs)

trunk/ippTools/src/difftool.c

@@ -820 +820 @@
     PXOPT_COPY_S64(config->args, where,  "-diff_id", "diffSkyfile.diff_id", "==");
     PXOPT_COPY_STR(config->args, where,  "-skycell_id", "diffSkyfile.skycell_id", "==");
-    PXOPT_COPY_STR(config->args, where,  "-label", "diffRun.label", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "diffRun.label", "==");
     PXOPT_COPY_S16(config->args, where, "-fault",     "fault", "==");
 
@@ -2062 +2062 @@
       psS64 in_template_stack_id = psMetadataLookupS64(&mdok,input_row,"max_stack_id");
       psString in_tess_id = psMetadataLookupStr(&mdok,input_row,"tess_id");
-      psTrace("difftool",1,"%s %ld %ld %s\n",in_skycell_id,in_input_stack_id,in_template_stack_id,in_tess_id);
+      psTrace("difftool",1,"%s %" PRId64 " %" PRId64 " %s\n",
+              in_skycell_id, in_input_stack_id, in_template_stack_id, in_tess_id);
       diffInputSkyfileRow *input = diffInputSkyfileRowAlloc(
                                                             run->diff_id,   // ID