From: eldy <>
Date: Wed, 17 Oct 2012 09:05:49 +0000 (+0000)
Subject: Fix: Exclude robots.txt from download view.
X-Git-Tag: AWSTATS_7_1_BETA3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4fc6ed32546676e6769d60cc5ebba2835f4436;p=thirdparty%2FAWStats.git

Fix: Exclude robots.txt from download view.
Fix: Add download view into awstats_buildstaticpages.pl script
---

diff --git a/test/test.pl b/test/test.pl
index 11841420..a2ba51c1 100644
--- a/test/test.pl
+++ b/test/test.pl
@@ -4,9 +4,9 @@
 #-----------------------------------------------------------------------------
 
 
-$DIRAWSTATS="/media/DATA/Mes Developpements/awstats/wwwroot/cgi-bin";
-$DIRCONF="/media/DATA/Mes Developpements/awstats/test/awstats/conf";
-$DIRRESULT="/media/DATA/Mes Developpements/awstats/test/awstats/result";
+$DIRAWSTATS="/media/HDDATA1_LD/Mes Developpements/awstats/wwwroot/cgi-bin";
+$DIRCONF="/media/HDDATA1_LD/Mes Developpements/awstats/test/awstats/conf";
+$DIRRESULT="/media/HDDATA1_LD/Mes Developpements/awstats/test/awstats/result";
 $TEMP="/temp";
 #$PERL="\"c:\\Program files\\cygwin\\bin\\perl.exe\"";
 $PERL="perl";
diff --git a/tools/awstats_buildstaticpages.pl b/tools/awstats_buildstaticpages.pl
index 95a77ac2..0f65fda9 100644
--- a/tools/awstats_buildstaticpages.pl
+++ b/tools/awstats_buildstaticpages.pl
@@ -51,7 +51,7 @@ $ShowEMailSenders $ShowEMailReceivers $ShowWormsStats $ShowClusterStats
 $ShowMenu $ShowMonthStats $ShowDaysOfMonthStats $ShowDaysOfWeekStats
 $ShowHoursStats $ShowDomainsStats $ShowHostsStats
 $ShowRobotsStats $ShowSessionsStats $ShowPagesStats $ShowFileTypesStats
-$ShowOSStats $ShowBrowsersStats $ShowOriginStats
+$ShowOSStats $ShowBrowsersStats $ShowDownloadsStats $ShowOriginStats
 $ShowKeyphrasesStats $ShowKeywordsStats $ShowMiscStats $ShowHTTPErrorsStats
 $BuildReportFormat
 @ExtraName
@@ -354,6 +354,7 @@ if ($ShowPagesStats) { push @OutputList,'urldetail'; push @OutputList,'urlentry'
 #if ($ShowFileTypesStats) { push @OutputList,'filetypes'; }	# There is dedicated page for filetypes
 if ($ShowOSStats) { push @OutputList,'osdetail'; push @OutputList,'unknownos'; }
 if ($ShowBrowsersStats) { push @OutputList,'browserdetail'; push @OutputList,'unknownbrowser'; }
+if ($ShowDownloadsStats) { push @OutputList,'downloads'; }
 if ($ShowScreenSizeStats) { push @OutputList,'screensize'; }
 if ($ShowOriginStats) { push @OutputList,'refererse'; push @OutputList,'refererpages'; }
 if ($ShowKeyphrasesStats) { push @OutputList,'keyphrases'; }
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 2ea66c2e..3c9af148 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -13,7 +13,6 @@
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
@@ -18548,7 +18547,8 @@ if ( $UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft' )
 				if ( $ValidHTTPCodes{ $field[$pos_code] } ) {    # Code is valid
 					if ( int($field[$pos_code]) == 304 && $pos_size>0) { $field[$pos_size] = 0; }
 					# track downloads
-					if (int($field[$pos_code]) == 200 && $MimeHashLib{$extension}[1] eq 'd'){
+					if (int($field[$pos_code]) == 200 && $MimeHashLib{$extension}[1] eq 'd' && $urlwithnoquery !~ /robots.txt$/ )  # We track download if $MimeHashLib{$extension}[1] = 'd'
+					{
 						$_downloads{$urlwithnoquery}->{'AWSTATS_HITS'}++;
 						$_downloads{$urlwithnoquery}->{'AWSTATS_SIZE'} += ($pos_size>0 ? int($field[$pos_size]) : 0);
 						if ($Debug) { debug( " New download detected: '$urlwithnoquery'", 2 ); }