From: eldy <>
Date: Wed, 7 Jan 2004 21:54:23 +0000 (+0000)
Subject: Count of keywords/keyphrases does not increment counter for hits made on images from... 
X-Git-Tag: AWSTATS_6_0_RELEASE~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bcc3c650c38aeaadfa927962d76f85d73fa8b2c;p=thirdparty%2FAWStats.git

Count of keywords/keyphrases does not increment counter for hits made on images from a google cached page.
---

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 795a28b0..ab5799d6 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -63,6 +63,8 @@ New features/improvements:
 - Added percent column for file types.
 - The robot chart now shows details between hits on robots.txt file and
   other hits.
+- Count of keywords/keyphrases does not increment counter for hits made
+  on images from a google cached page.
 - Added patch 857319: Allow several IPs and IP ranges in
   AllowAccessFromWebToFollowingIPAddresses parameter.
 - Added experimental graphapplet plugin (graph are built by applet).
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index a8cf5cc3..e887b2d0 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -6521,7 +6521,8 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 							$_from_h[2]++;
 							$_se_referrals_h{$TmpRefererServer{$refererserver}}++;
 							$found=1;
-							if ($LevelForKeywordsDetection) {
+							if ($PageBool && $LevelForKeywordsDetection) {
+								# we will complete %_keyphrases hash array
 								my @refurl=split(/\?/,$field[$pos_referer],2);	# TODO Use \? or [$URLQuerySeparators] ?
 								if ($refurl[1]) {
 									# Extract params of referer query string (q=cache:mmm:www/zzz+aaa+bbb q=aaa+bbb/ccc key=ddd%20eee lang_en ie=UTF-8 ...)
@@ -6531,8 +6532,8 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 											if ($param =~ s/^$SearchEnginesKnownUrl{$TmpRefererServer{$refererserver}}//) {
 												# We found good parameter
 												# Now param is keyphrase: "cache:mmm:www/zzz+aaa+bbb/ccc+ddd%20eee'fff,ggg"
-												$param =~ s/^(cache|related):[^\+]+//;
-												&ChangeWordSeparatorsIntoSpace($param);		# Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg]
+												$param =~ s/^(cache|related):[^\+]+//;	# Should ne useless since this is for hit on 'not pages'
+												&ChangeWordSeparatorsIntoSpace($param);	# Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg]
 												$param =~ s/^ +//; $param =~ s/ +$//; $param =~ tr/ /\+/s;
 												if ((length $param) > 0) { $_keyphrases{$param}++; }
 												last;
@@ -6550,8 +6551,8 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 											# We found good parameter
 											$param =~ s/.*=//;
 											# Now param is keyphrase: "aaa+bbb/ccc+ddd%20eee'fff,ggg"
-											$param =~ s/^(cache|related):[^\+]+//;
-											&ChangeWordSeparatorsIntoSpace($param);			# Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg ]
+											$param =~ s/^(cache|related):[^\+]+//;		# Should ne useless since this is for hit on 'not pages'
+											&ChangeWordSeparatorsIntoSpace($param);		# Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg ]
 											$param =~ s/^ +//; $param =~ s/ +$//; $param =~ tr/ /\+/s;
 											if ((length $param) > 2) { $_keyphrases{$param}++; last; }
 										}