Merge branch 'gatherstats' into next
* gatherstats: Get empty 'virtual' hierarchies working.
This commit is contained in:
		
						commit
						cce2fd0b7f
					
				
					 2 changed files with 11 additions and 8 deletions
				
			
		| 
						 | 
				
			
			@ -33,6 +33,7 @@ require Exporter;
 | 
			
		|||
  SplitPeriod
 | 
			
		||||
  ListMonth
 | 
			
		||||
  ListNewsgroups
 | 
			
		||||
  ParseHierarchies
 | 
			
		||||
  ReadGroupList
 | 
			
		||||
  OutputData
 | 
			
		||||
  FormatOutput
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,7 +19,7 @@ BEGIN {
 | 
			
		|||
}
 | 
			
		||||
use strict;
 | 
			
		||||
 | 
			
		||||
use NewsStats qw(:DEFAULT :TimePeriods ListNewsgroups ReadGroupList);
 | 
			
		||||
use NewsStats qw(:DEFAULT :TimePeriods ListNewsgroups ParseHierarchies ReadGroupList);
 | 
			
		||||
 | 
			
		||||
use DBI;
 | 
			
		||||
use Getopt::Long qw(GetOptions);
 | 
			
		||||
| 
						 | 
				
			
			@ -145,13 +145,15 @@ foreach my $Month (&ListMonth($Period)) {
 | 
			
		|||
    if (%ValidGroups) {
 | 
			
		||||
      foreach (sort keys %ValidGroups) {
 | 
			
		||||
        if (!defined($Postings{$_})) {
 | 
			
		||||
          # expand newsgroup with hierarchies
 | 
			
		||||
          my @Newsgroups = ParseHierarchies($_);
 | 
			
		||||
          # add each empty newsgroup and empty hierarchies, too, as needed
 | 
			
		||||
          foreach (@Newsgroups) {
 | 
			
		||||
            if (!defined($Postings{$_})) {
 | 
			
		||||
              $Postings{$_} = 0;
 | 
			
		||||
              warn (sprintf("ADDED: %s as empty group\n",$_));
 | 
			
		||||
          # add current newsgroup as empty group
 | 
			
		||||
          $Postings{$_} = 0;
 | 
			
		||||
          warn (sprintf("ADDED: %s as empty group\n",$_));
 | 
			
		||||
          # add empty hierarchies for current newsgroup as needed
 | 
			
		||||
          foreach (ParseHierarchies($_)) {
 | 
			
		||||
            my $Hierarchy = $_ . '.ALL';
 | 
			
		||||
            if (!defined($Postings{$Hierarchy})) {
 | 
			
		||||
              $Postings{$Hierarchy} = 0;
 | 
			
		||||
              warn (sprintf("ADDED: %s as empty group\n",$Hierarchy));
 | 
			
		||||
            };
 | 
			
		||||
          };
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue