Changeset 34485

Timestamp:

Sep 27, 2012, 1:27:02 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Removed -difftype argument which is got from difftool output now

File:

• trunk/ippScripts/scripts/publish_file.pl (modified) (2 diffs)

trunk/ippScripts/scripts/publish_file.pl

@@ -63 +63 @@
     'redirect-output'   => \$redirect,   # Redirect output to log file?
     'output_format=i'   => \$output_format, # Output format for ppMops
-    'difftype=s'        => \$difftype,    # "WW" / "WS" / "SW"
     ) or pod2usage( 2 );
 
@@ -224 +223 @@
             &my_die("Unable to parse metadata list", $pub_id, $PS_EXIT_PROG_ERROR);
         my $reg_comp = $$reg_components[0];
+
+        # Now get the difftype value from diff->{diff_mode}
+        my $difftype = "";
+        if ($comp->{diff_mode} == 1) {
+            $difftype = "WW";
+        } elsif ($comp->{diff_mode} == 2) {
+            $difftype = "WS";
+        } elsif ($comp->{diff_mode} == 3) {
+            $difftype = "SW"; # Not used yet
+        } elsif ($comp->{diff_mode} == 4) {
+            $difftype = "SS";
+        } else {
+            $difftype = "Unsupported diff_mode value: [" . $comp->{diff_mode} . "]";
+        }
 
         my $data = { zp => $zp,