From: eldy <> Date: Thu, 24 Nov 2005 20:01:33 +0000 (+0000) Subject: Update xsd files and fix xml support to have now a full support of xslt and xml valid... X-Git-Tag: AWSTATS_6_5_BETA_2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a6e3810eb0a367efce150bfb1721413f70fe87d;p=thirdparty%2FAWStats.git Update xsd files and fix xml support to have now a full support of xslt and xml validation. --- diff --git a/tools/xslt/README.txt b/tools/xslt/README.txt index fd69f569..aae19107 100644 --- a/tools/xslt/README.txt +++ b/tools/xslt/README.txt @@ -1,3 +1,4 @@ +----- README.txt about AWStats XSLT demo ----- This directory is absolutely not required to make AWStats working. All files here are demo files you can use if you want to manipulate AWStats XML database to build report by yourself and without using AWStats output features. @@ -5,18 +6,18 @@ database to build report by yourself and without using AWStats output features. The following file describe the structure of the AWStats XML database (built when BuildHistoryOutput is set to 'xml'). -* awstats61.xsd File descriptor for AWStats xml database schema. +* awstats.xsd File descriptor for AWStats xml database schema. The following two files can be used to test a xslt processing to transform an AWStats XML database (built when BuildHistoryOutput is set to 'xml'). into a report. -* awstats61.datademo1.xml A xml data demo file to test xslt transform with style sheet. -* awstats61.datademo1.xslt A demo xsl style sheet to transform de xml data demo file. +* awstats.datademo1.xml A xml data demo file to test xslt transform with style sheet. +* awstats.datademo1.xslt A demo xsl style sheet to transform de xml data demo file. To build a report using this 2 files and a xslt processor, you must run the command: -xsltproc awstats61.datademo1.xslt awstats61.datademo1.xml > output.html +xsltproc awstats.datademo1.xslt awstats.datademo1.xml > output.html diff --git a/tools/xslt/awstats61.datademo1.xml b/tools/xslt/awstats.datademo1.xml similarity index 90% rename from tools/xslt/awstats61.datademo1.xml rename to tools/xslt/awstats.datademo1.xml index 944c7dfa..961627eb 100644 --- a/tools/xslt/awstats61.datademo1.xml +++ b/tools/xslt/awstats.datademo1.xml @@ -1,11 +1,10 @@ - - + -AWSTATS DATA FILE 6.1 (build 1.737) +AWSTATS DATA FILE 6.5 (build 1.856) -# If you remove this file, all statistics for date 2001-01 will be lost/reset. +# If you remove this file, all statistics for date 200101 will be lost/reset. +
+ 10 + +# Host - Pages - Hits - Bandwidth - Last visit date - [Start date of last visit] - [Last page of last visit] +# [Start date of last visit] and [Last page of last visit] are saved only if session is not finished +# The 10 first Hits must be first (order not required for others) + + +BEGIN_VISITOR + 7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
80.8.55.18149410420010101220025
80.8.55.10664228562001010202300020010102020000/page1.html
80.8.55.3464205420010101220125
80.8.55.7221401820010101230100
80.8.55.616882920010101230000
80.8.55.4017009 +
80.8.55.2017009 +
+ END_VISITOR + +
+
+ +# Date - Pages - Hits - Bandwidth - Visits + + +BEGIN_DAY + 2 + + + + + + + + + + + + + + + +
2001010115301730235
20010102664228561
+ END_DAY
@@ -492,7 +589,7 @@ BEGIN_DOMAIN 1 - + @@ -524,18 +621,18 @@ BEGIN_LOGIN2
frip 21 36 595879
- + - - - + + + - - + - - + + +
johnJohn_Begood 27158382001010123000021401820010101230100
John_Begood1john 17009200101012301006882920010101230000
END_LOGIN @@ -609,6 +706,78 @@ BEGIN_EMAILRECEIVER
END_EMAILRECEIVER + +
+
+ +# Session range - Number of visits + + +BEGIN_SESSION + 1 + + + + + +
0s-30s5
+ END_SESSION + +
+
+ 10 + +# URL - Pages - Bandwidth - Entry - Exit +# The 10 first Pages must be first (order not required for others) + + +BEGIN_SIDER + 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
/837340740
/page1.html49150300
/page332102703
/page2.cgi32102700
/cgi-bin/order.cgi21401821
/do/Show1700901
+ END_SIDER
@@ -649,15 +818,15 @@ BEGIN_FILETYPES cgi - 6 - 42054 + 5 + 35045 0 0 Unknown - 3 - 21027 + 4 + 28036 0 0 @@ -678,15 +847,19 @@ BEGIN_FILETYPES BEGIN_OS - 6 + 7 + + + + - - + + @@ -694,15 +867,15 @@ BEGIN_OS - + - - + + - - + +
linuxmandr1
macosx 1
winme6linuxredhat1
win95
win20001218
win981Unknown6
Unknown8win981
END_OS @@ -714,31 +887,35 @@ BEGIN_OS BEGIN_BROWSER - 7 + 8 - - - - - + + + + + - - + + - - + + - - + + + + + + @@ -770,16 +947,12 @@ BEGIN_SCREENSIZE BEGIN_UNKNOWNREFERER - 2 + 1
netscape7.11
firebirdfirefox1.0 6
mozilla2
netscape7.1 1
msie5.512opera1
up\.7sagem6
opera1firebird6
msie5.56
netscape4.7
- - - -
SAGEM-myX-5m/1.0_UP.Browser/6.1.0.6.1.103_(GUI)_MMP/1.0_(Google_WAP_Proxy/1.0) 20010101230000
Mozilla/3.01_(compatible;)20010101230100
END_UNKNOWNREFERER @@ -821,13 +994,13 @@ BEGIN_ORIGIN From3 - 10 - 10 + 9 + 9 From4 - 0 - 0 + 1 + 1 From5 @@ -844,12 +1017,17 @@ BEGIN_ORIGIN BEGIN_SEREFERRALS - 1 + 2 - - + + + + + + +
google2716
a911
END_SEREFERRALS @@ -863,7 +1041,7 @@ BEGIN_SEREFERRALS BEGIN_PAGEREFS - 6 + 5 @@ -875,11 +1053,6 @@ BEGIN_PAGEREFS - - - - - @@ -909,6 +1082,32 @@ BEGIN_PAGEREFS BEGIN_SEARCHWORDS2
http://us.f109.mail.yahoo.com/ym/ShowLetter 1 1
http://localhost/page1.html11
http://WWW.SiteRefereR:80/cgi-bin/azerty.pl 1
+ + + + + + + + +
ma%c3%aetre+è­¨ve1
searchkeyfroma91
+ END_SEARCHWORDS + +
+
+ 10 + +# Search keywords - Number of search +# The 10 first number of search must be first (order not required for others) + + +BEGIN_KEYWORDS + 3 + + + + + @@ -918,7 +1117,7 @@ BEGIN_SEARCHWORDS
searchkeyfroma91
ma%c3%aetre 1 1
- END_SEARCHWORDS + END_KEYWORDS
@@ -980,13 +1179,6 @@ BEGIN_SIDER_404 BEGIN_EXTRA_1 2 - - - - - - - @@ -994,187 +1186,15 @@ BEGIN_EXTRA_1 -
99822020010101230000
999 1 0 20010101230100
- END_EXTRA_1 - -
-
- 10 - -# Host - Pages - Hits - Bandwidth - Last visit date - [Start date of last visit] - [Last page of last visit] -# [Start date of last visit] and [Last page of last visit] are saved only if session is not finished -# The 10 first Hits must be first (order not required for others) - - -BEGIN_VISITOR - 7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - -
80.8.55.18149410420010101220025
80.8.55.10664228562001010202300020010102020000/page1.html
80.8.55.3464205420010101220125
80.8.55.6271583820010101230000
80.8.55.711700920010101230100
80.8.55.4017009 -
80.8.55.20998 17009 -
- END_VISITOR - -
-
- -# Date - Pages - Hits - Bandwidth - Visits - - -BEGIN_DAY - 2 - - - - - - - - - - - - - - -
2001010115301730235
2001010266422856 1
- END_DAY - -
-
- -# Session range - Number of visits - - -BEGIN_SESSION - 1 - - - - - -
0s-30s5
- END_SESSION - -
-
- 10 - -# URL - Pages - Bandwidth - Entry - Exit -# The 10 first Pages must be first (order not required for others) - - -BEGIN_SIDER - 5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
/837340740
/page1.html49150300
/page332102703
/cgi-bin/order.cgi32102722
/page2.cgi3210270 020010101230000
- END_SIDER - -
-
- 10 - -# Search keywords - Number of search -# The 10 first number of search must be first (order not required for others) - - -BEGIN_KEYWORDS - 2 - - - - - - - - - -
ma%c3%aetre1
è­¨ve1
- END_KEYWORDS + END_EXTRA_1
diff --git a/tools/xslt/awstats61.datademo1.xslt b/tools/xslt/awstats.datademo1.xslt similarity index 100% rename from tools/xslt/awstats61.datademo1.xslt rename to tools/xslt/awstats.datademo1.xslt diff --git a/tools/xslt/awstats61.xsd b/tools/xslt/awstats.xsd similarity index 78% rename from tools/xslt/awstats61.xsd rename to tools/xslt/awstats.xsd index 8a1c9e06..f0a195bc 100644 --- a/tools/xslt/awstats61.xsd +++ b/tools/xslt/awstats.xsd @@ -1,36 +1,19 @@ - - - - - - - - - - - - - - - - - - - + - + + - - + + @@ -108,4 +91,4 @@ - + \ No newline at end of file