Merge branch 'gatherstats' into next

[usenet/newsstats.git] / NewsStats.pm

diff --git a/NewsStats.pm b/NewsStats.pm
index bdfdcf5..428719e 100644 (file)
--- a/NewsStats.pm
+++ b/NewsStats.pm
@@ -184,7 +184,7 @@ sub ListNewsgroups {
     next if($TLH and !/^$TLH/);
     # don't count invalid newsgroups
     if(%ValidGroups and !defined($ValidGroups{$_})) {
     next if($TLH and !/^$TLH/);
     # don't count invalid newsgroups
     if(%ValidGroups and !defined($ValidGroups{$_})) {

-      &Bleat(1,sprintf("DROPPED: %s",$_));
+      warn (sprintf("DROPPED: %s\n",$_));

       next;
     }
     # add original newsgroup to %Newsgroups
       next;
     }
     # add original newsgroup to %Newsgroups


@@ -230,8 +230,9 @@ sub ReadGroupList {
   my %ValidGroups;
   open (my $LIST,"<$Filename") or &Bleat(2,"Cannot read $Filename: $!");
   while (<$LIST>) {
   my %ValidGroups;
   open (my $LIST,"<$Filename") or &Bleat(2,"Cannot read $Filename: $!");
   while (<$LIST>) {

-    s/^(\S+).*$/$1/;
+    s/^\s*(\S+).*$/$1/;

     chomp;
     chomp;

+    next if /^$/;

     $ValidGroups{$_} = '1';
   };
   close $LIST;
     $ValidGroups{$_} = '1';
   };
   close $LIST;