From: eldy <>
Date: Sat, 16 Aug 2003 23:07:45 +0000 (+0000)
Subject: Better support for Webstar LogFormat=3.
X-Git-Tag: AWSTATS_WEBMIN_1_0_RELEASE~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4407060620d54e331cf1e2b62b6063d31df9a72f;p=thirdparty%2FAWStats.git

Better support for Webstar LogFormat=3.
---

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index da7f743c..0a0d20e1 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -4401,7 +4401,7 @@ sub DefinePerlParsingFormat {
 			@fieldlib=('date','host','logname','method','url','code','size','ua','referer');
 		}
 		elsif ($LogFormat eq '3') {
-			$PerlParsingFormat="([^\\t]*\\t[^\\t]*)\\t([^\\t]*)\\t([\\d|-]*)\\t([^\\t]*)\\t([^\\t]*)\\t([^\\t]*)\\t[^\\t]*\\t.*:([^\\t]*)\\t([\\d]*)";
+			$PerlParsingFormat="([^\\t]*\\t[^\\t]*)\\t([^\\t]*)\\t([\\d|-]*)\\t([^\\t]*)\\t([^\\t]*)\\t([^\\t]*)\\t[^\\t]*\\t([^\\t]*)\\t([\\d]*)";
 			$pos_date=0;$pos_method=1;$pos_code=2;$pos_host=3;$pos_agent=4;$pos_referer=5;$pos_url=6;$pos_size=7;
 			@fieldlib=('date','method','code','host','ua','referer','url','size');
 		}
@@ -5346,6 +5346,12 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 			}
 		}
 
+		# Convert URL for Webstar to common URL
+		if ($LogFormat eq '3') {
+			$field[$pos_url]=~s/:/\//g;
+			if ($field[$pos_code] eq '-') { $field[$pos_code]='200'; }
+		}
+
 		# Here, field array, timerecord and yearmonthdayrecord are initialized for log record
 		if ($Debug) { debug("  This is a not already processed record ($timerecord)",4); }