[Pgp-tools-commit] r422 - in trunk/keyanalyze: . scripts

[thialme-guest at alioth.debian.org]

Author: thialme-guest
Date: 2009-03-30 21:41:47 +0000 (Mon, 30 Mar 2009)
New Revision: 422

Modified:
   trunk/keyanalyze/analyze.sh
   trunk/keyanalyze/scripts/top50.pl
Log:
Fixed both analyze.sh and top50.pl scripts.

  [analyze.sh]
  * Made the entries in the msd-sorted.txt file sorted.
  * Used msd.txt file as input for top50.pl. The current pattern in top50.pl
    does not match data from the msd-sorted.txt file.
  * Allowed the top1000 report to report the first 1000 ranks by passing
    *-n 1000* to top50.pl. Set to 50 by default.

  [top50.pl]
  * Fixed the error message when a line from stdin does not match the pattern.


Modified: trunk/keyanalyze/analyze.sh
===================================================================
--- trunk/keyanalyze/analyze.sh	2009-03-10 16:19:07 UTC (rev 421)
+++ trunk/keyanalyze/analyze.sh	2009-03-30 21:41:47 UTC (rev 422)
@@ -13,10 +13,10 @@
 # html beautification and reports and such
 # comment this out if you don't want all the stuff in the report
 # at http://dtype.org/keyanalyze/
-cat output/msd.txt | sort -n -k 3 | nl -s ' ' > output/msd-sorted.txt
-head -n 50 output/msd-sorted.txt | scripts/top50.pl > output/top50table.html
+cat output/msd.txt | sort -k 3 | nl -s ' ' > output/msd-sorted.txt
+cat output/msd.txt | scripts/top50.pl > output/top50table.html
 cat scripts/report_top.php output/top50table.html \
 	scripts/report_bottom.php > output/report.php
-head -n 1000 output/msd-sorted.txt | scripts/top50.pl > output/top1000table.html
+cat output/msd.txt | scripts/top50.pl -n 1000 > output/top1000table.html
 cat scripts/1000_top.php output/top1000table.html \
 	scripts/1000_bottom.php > output/report_1000.php

Modified: trunk/keyanalyze/scripts/top50.pl
===================================================================
--- trunk/keyanalyze/scripts/top50.pl	2009-03-10 16:19:07 UTC (rev 421)
+++ trunk/keyanalyze/scripts/top50.pl	2009-03-30 21:41:47 UTC (rev 422)
@@ -34,7 +34,7 @@
 
 my %msd;
 while (my $line = <>) {
-	$line =~ /^\w+\s+(\w+)\s+([\d\.]+)/ or die "cannot parse line $.: $_";
+	$line =~ /^\w+\s+(\w+)\s+([\d\.]+)/ or die "cannot parse line $.: $line";
 	$msd{$1} = $2;
 }