Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of ssh://trac.corp.sourceforge.com/srv/git/slash

  • Loading branch information...
commit bfdfbdab4b2c7aa0b76d895d5d59d317cc2cd10f 2 parents 236a506 + 1b270cf
@jamiemccarthy jamiemccarthy authored
Showing with 12 additions and 3 deletions.
  1. +11 −2 plugins/Stats/Stats.pm
  2. +1 −1  plugins/Stats/adminmail.pl
View
13 plugins/Stats/Stats.pm
@@ -1287,11 +1287,20 @@ sub countDailyByPages {
########################################################
sub countFromRSSStatsBySections {
- my ($self) = @_;
+ my($self, $options) = @_;
+ my $op_clause = '';
+ if ($options->{no_op}) {
+ my $no_op = $options->{no_op};
+ $no_op = [ $no_op ] if !ref($no_op);
+ if (@$no_op) {
+ my $op_not_in = join(",", map { $self->sqlQuote($_) } @$no_op);
+ $op_clause = " AND op NOT IN ($op_not_in)";
+ }
+ }
$self->sqlSelectAllHashref("skid",
"skid, count(*) AS cnt, COUNT(DISTINCT uid) AS uids, COUNT(DISTINCT host_addr) AS ipids",
"accesslog_temp",
- "referer='rss'",
+ "referer='rss'$op_clause",
"GROUP BY skid");
}
View
2  plugins/Stats/adminmail.pl
@@ -447,7 +447,7 @@
# 1 hour
slashdLog("Sectional Stats Begin");
my $skins = $slashdb->getDescriptions('skins');
- my $stats_from_rss = $logdb->countFromRSSStatsBySections();
+ my $stats_from_rss = $logdb->countFromRSSStatsBySections({ no_op => $constants->{op_exclude_from_countdaily} });
#XXXSECTIONTOPICS - don't think we need this anymore but just making sure
#$sections->{index} = 'index';
Please sign in to comment.
Something went wrong with that request. Please try again.