Fixed bug #37779: Make result file names insensitive to order of input sources when using --header

This commit is contained in:
Ole Tange 2012-11-26 21:40:26 +01:00
parent 4688ba04c9
commit d47e1306ec
2 changed files with 11 additions and 4 deletions

View file

@ -4287,15 +4287,22 @@ sub args_as_filename {
my @res = (); my @res = ();
for my $rec_ref (@{$self->{'arg_list'}}) { for my $rec_ref (@{$self->{'arg_list'}}) {
for my $n (0 .. $#$rec_ref) { no warnings 'numeric';
my @header_indexes_sorted = sort {
# Sort headers numerically then asciibetically
$Global::input_source_header{$a} <=> $Global::input_source_header{$b}
or
$Global::input_source_header{$a} cmp $Global::input_source_header{$b}
} 1 .. $#$rec_ref+1;
for my $n (@header_indexes_sorted) {
CORE::push(@res, CORE::push(@res,
$Global::input_source_header{$n+1}, $Global::input_source_header{$n},
map { my $s = $_; map { my $s = $_;
$s =~ s/\\/\\\\/g; $s =~ s/\\/\\\\/g;
$s =~ s/\t/\\t/g; $s =~ s/\t/\\t/g;
$s =~ s/\0/\\0/g; $s =~ s/\0/\\0/g;
$s =~ s:/:\\_:g; $s; } $s =~ s:/:\\_:g; $s; }
$rec_ref->[$n]->orig()); $rec_ref->[$n-1]->orig());
} }
} }
return join "\t", @res; return join "\t", @res;

View file

@ -1014,7 +1014,7 @@ will generate the files:
and and
parallel --results foo/bar echo {1} {2} ::: 1 2 ::: 3 4 parallel --results foo/bar echo {1} {2} ::: I II ::: III IIII
will generate the files: will generate the files: