diff -r 22e8d3918a31 -r 1f3285cd5668 common/tools/analysis/merge_csv.pl --- a/common/tools/analysis/merge_csv.pl Mon Jun 01 17:05:47 2009 +0100 +++ b/common/tools/analysis/merge_csv.pl Mon Jun 01 17:19:32 2009 +0100 @@ -32,8 +32,8 @@ my %ziptimes; if(defined $zipfile) { - open(ZIP,"7z l $zipfile 2>&1|") or die "Error: Couldn't look in $zipfile\n"; -# print "time,file\n"; + open(ZIP,"7za l $zipfile 2>&1|") or die "Error: Couldn't look in $zipfile\n"; + #print "time,file\n"; while( my $line = ) { if($line =~ m/^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s\S{5}\s+(\d+)\s+\d+\s+(.+)$/) #ignoring packed size... @@ -44,7 +44,7 @@ $name =~ s/\\/\//g; $name = lc($name); $ziptimes{$name} = $time; -# print "$time,$name\n"; + #print "$time,$name\n"; } } close ZIP;