X-Git-Url: https://code.th-h.de/?p=usenet%2Fnewsstats.git;a=blobdiff_plain;f=NewsStats.pm;h=781272d51453c51694cfd2c3e1b7a5b0d8c74685;hp=2cb1be2ebf66a62bb7e7edafee890d9af8c38be9;hb=89db2f904dc9ddd07bfce9c3fe1fe81b58c1aa8b;hpb=ad6097927113a27587ed8b1785f18c4b18db58e8 diff --git a/NewsStats.pm b/NewsStats.pm index 2cb1be2..781272d 100644 --- a/NewsStats.pm +++ b/NewsStats.pm @@ -156,10 +156,11 @@ sub ListNewsgroups { ### hierarchy names where every newsgroup and hierarchy appears only once: ### de.alt.test,de.alt.admin -> de.ALL, de.alt.ALL, de.alt.test, de.alt.admin ### IN : $Newsgroups : a list of newsgroups (content of Newsgroups: header) +### $TLH : top level hierarchy (all other newsgroups are ignored) ### $ValidGroupsR: reference to a hash containing all valid newsgroups ### as keys ### OUT: %Newsgroups : hash containing all newsgroup and hierarchy names as keys - my ($Newsgroups,$ValidGroupsR) = @_; + my ($Newsgroups,$TLH,$ValidGroupsR) = @_; my %ValidGroups = %{$ValidGroupsR} if $ValidGroupsR; my %Newsgroups; chomp($Newsgroups); @@ -167,6 +168,8 @@ sub ListNewsgroups { $Newsgroups =~ s/\s//; # call &HierarchyCount for each newsgroup in $Newsgroups: for (split /,/, $Newsgroups) { + # don't count newsgroup/hierarchy in wrong TLH + next if($TLH and !/^$TLH/); # don't count invalid newsgroups if(%ValidGroups and !defined($ValidGroups{$_})) { warn (sprintf("DROPPED: %s\n",$_));