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

scc · Jul 3, 2008 · bfdfbda · bfdfbda
2 parents 236a506 + 1b270cf
commit bfdfbda
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/plugins/Stats/Stats.pm b/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");
 }
 

diff --git a/plugins/Stats/adminmail.pl b/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';