More nvi cleaning.

[bugscan.git] / bugreport

diff --git a/bugreport b/bugreport
index f6be50a60c198761dde79b126e90981cf1b43048..bee423dd3d6c0073d2179970f14389bc295fc2ec 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -45,13 +45,18 @@ sub PrintPackageHeader() {
        my ($name, $email);     # Name & email of maintainer
 
        if ($html) {
        my ($name, $email);     # Name & email of maintainer
 
        if ($html) {

-           print "<div class=\"package\"><pre>";
-               print "<a name=\"$p\"><strong>Package:</strong></a> " . &wwwname($p);
+               print "<div class=\"package\"><pre>";
+               print "<a name=\"$p\"><strong>Package:</strong></a> " . scanlib::wwwname($p);

                print " ($scanlib::section{$p}).\n";
                print "<strong>Maintainer:</strong> ";
                if (defined($scanlib::maintainer{$p})) {
                print " ($scanlib::section{$p}).\n";
                print "<strong>Maintainer:</strong> ";
                if (defined($scanlib::maintainer{$p})) {

-                       $_ = $scanlib::maintainer{$p};
-                       ($name,$email) = m/(.*) <([^>]*)>/;
+                       if ($scanlib::maintainer{$p} =~ /(.*) <([^>]*)>/) {
+                               ($name,$email) = ($1,$2);
+                       } elsif ($scanlib::maintainer{$p} =~ /<(.*) \((.*)\)>/) {
+                               ($name,$email) = ($1,$2);
+                       } elsif ($scanlib::maintainer{$p} =~ /<(.*)>/) {
+                               $name = $email = $1;
+                       }

                        print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
                } else {
                        print "unknown\n";
                        print "$name &lt;<a href=\"http://bugs.debian.org/$email\">$email</A>&gt;\n";
                } else {
                        print "unknown\n";


@@ -77,7 +82,7 @@ sub MakeBuglist() {
        my $header;             # Flag if packagename has already been printed
        my $fontset;            # Did we change the font?
 
        my $header;             # Flag if packagename has already been printed
        my $fontset;            # Did we change the font?
 

-       for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
+       for my $p (sort {$a->[0] <=> $b->[0]} keys %scanlib::packagelist) {

                next if (defined $bugcfg::exclude{$p});
                $header = 0;
                $fontset = 0;
                next if (defined $bugcfg::exclude{$p});
                $header = 0;
                $fontset = 0;


@@ -92,7 +97,7 @@ sub MakeBuglist() {
                        &PrintPackageHeader($p);
                        print $scanlib::comments{$p};
                }
                        &PrintPackageHeader($p);
                        print $scanlib::comments{$p};
                }

-               for $nr (sort split(/ /, $scanlib::packagelist{$p})) {
+               for $nr (sort @{$scanlib::packagelist{$p}}) {

                        next if (defined $bugcfg::exclude{$nr});
                        if (! $header) {
                                $header = 1;
                        next if (defined $bugcfg::exclude{$nr});
                        if (! $header) {
                                $header = 1;


@@ -114,8 +119,8 @@ sub MakeBuglist() {
                                print "<strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
                                print "<em class=\"worry\">" if $worry;
                                ($sect=$nr) =~ s/([0-9]{2}).*/$1/;
                                print "<strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
                                print "<em class=\"worry\">" if $worry;
                                ($sect=$nr) =~ s/([0-9]{2}).*/$1/;

-                               print "<A NAME=\"$nr\"></A>  " . &wwwnumber($nr) . ' ' .
-                                         htmlsanit($scanlib::bugs{$nr}) . "\n";
+                               print "<A NAME=\"$nr\"></A>  " . scanlib::wwwnumber($nr) . ' ' .
+                                         scanlib::htmlsanit($scanlib::bugs{$nr}) . "\n";

                                print "</em>" if $worry;
                                print "</strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
                        } else {
                                print "</em>" if $worry;
                                print "</strike>" if ($scanlib::bugs{$nr} =~ m/^\[.......I\]/);
                        } else {


@@ -135,22 +140,20 @@ sub MakeBuglist() {
 
 
 sub MakeStatistics() {
 
 
 sub MakeStatistics() {

-       my $bugcount;           # Total number of bugs so far
-       my $count;              # Number of bugs for this package
-       my $remtotal;           # Total number of bugs for packages marked REMOVE
-       my $patchtotal;         # Total number of bugs marked patch
-       my $pendingtotal;       # Total number of bugs marked pending
-       my $ignoretotal;        # Total number of bugs marked ignore
-       my $nottestingtotal;    # Total number of bugs on packages not in testing
-       my $worrytotal;         # Total number of bugs we're actually worried about
-       my $p;                  # Index variable
+       my $bugcount=0;         # Total number of bugs so far
+       my $remtotal=0;         # Total number of bugs for packages marked REMOVE
+       my $patchtotal=0;       # Total number of bugs marked patch
+       my $pendingtotal=0;     # Total number of bugs marked pending
+       my $ignoretotal=0;      # Total number of bugs marked ignore
+       my $nottestingtotal=0;  # Total number of bugs on packages not in testing
+       my $worrytotal=0;       # Total number of bugs we're actually worried about

        my %list;               # List of bugnumber associated with package
 
        my %list;               # List of bugnumber associated with package
 

-       $bugcount=0;

        for my $p (sort keys %scanlib::packagelist) {
        for my $p (sort keys %scanlib::packagelist) {

+               my $count = 0;          # Number of bugs for this package
+

                next if (defined $scanlib::exclude{$p});
                next if (defined $scanlib::exclude{$p});

-               $count=0;
-               for my $nr (split(/ /, $scanlib::packagelist{$p})) {
+               for my $nr (@{$scanlib::packagelist{$p}}) {

                        $pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
                        $patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
                        $ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);
                        $pendingtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*P/);
                        $patchtotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*\+/);
                        $ignoretotal++ if ($scanlib::bugs{$nr} =~ m/^\[[^]]*I/);


@@ -198,7 +201,7 @@ sub FilterPackages($) {
 
 sub FilterBugs() {
        for my $p (sort keys %scanlib::packagelist) {
 
 sub FilterBugs() {
        for my $p (sort keys %scanlib::packagelist) {

-               $scanlib::packagelist{$p} = join(' ', grep { check_worry($scanlib::bugs{$_}) } split / /, $scanlib::packagelist{$p});
+               $scanlib::packagelist{$p} = join(' ', grep { scanlib::check_worry($scanlib::bugs{$_}) } split / /, $scanlib::packagelist{$p});

                delete $scanlib::packagelist{$p} if ($scanlib::packagelist{$p} eq '');
        }
 }
                delete $scanlib::packagelist{$p} if ($scanlib::packagelist{$p} eq '');
        }
 }