From: eldy <>
Date: Fri, 12 Sep 2003 14:23:21 +0000 (+0000)
Subject: Enhance the 'Extra' feature with parameters ExtraSectionFirstColumnFormatX, ExtraSect... 
X-Git-Tag: AWSTATS_WEBMIN_1_0_RELEASE~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48461269b2fea129e599af64c088698a42d53c11;p=thirdparty%2FAWStats.git

Enhance the 'Extra' feature with parameters ExtraSectionFirstColumnFormatX, ExtraSectionAddAverageRowX, ExtraSectionAddSumRowX. Also add a dedicated page in documentation.
---

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 649e7e96..6d30c61d 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -21,6 +21,9 @@ Fixes:
 - Fixed not working file type detection for default pages.
 
 New features/improvements:
+- Enhance the 'Extra' feature with parameters ExtraSectionFirstColumnFormatX,
+  ExtraSectionAddAverageRowX, ExtraSectionAddSumRowX.
+  Also add a dedicated page in documentation.
 - Added %lognamequot tag for LogFormat parameter.
 - Added OnlyUserAgents parameter.
 - Added awredir.pl tool.
diff --git a/docs/awstats_config.html b/docs/awstats_config.html
index 8d8590f1..822c4242 100644
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -1535,7 +1535,9 @@ color_u,color_v,color_p,color_h,color_k,color_s<br>
 <br><br><hr>
 
 <a name="Extra"><b>Extra...</b></a><br>
-<b>Version : </b>5.2+<br>
+<b>Version : </b><br>
+5.2+<br>
+5.8 for ExtraSectionFirstColumnFormatX, ExtraSectionAddAverageRowX, ExtraSectionAddSumRowX<br>
 <br># You can define your own charts, you choose here what are rows and columns
 <br># keys. This feature is particularly usefull for marketing purpose, tracking
 <br># products orders for example.
@@ -1556,8 +1558,11 @@ color_u,color_v,color_p,color_h,color_k,color_s<br>
 <br>#   extract the value used for first column. Each different value found will
 <br>#   be a different row. Be sure that list of different values is "limited" to
 <br>#   avoid "not enough memory" problems !
+<br># ExtraSectionFirstColumnFormatX is the string used to write value.
 <br># ExtraSectionStatTypesX are things you want to count. You can use standard
 <br>#   code letters (P for pages,H for hits,B for bandwidth,L for last access).
+<br># ExtraSectionAddAverageRowX add a row at bottom of chart with average values.
+<br># ExtraSectionAddSumRowX add a row at bottom of chart with sum values.
 <br># MaxNbOfExtraX is maximum number of rows shown in chart.
 <br># MinHitExtraX is minimum number of hits required to be shown in chart.
 <br>#
@@ -1567,7 +1572,10 @@ color_u,color_v,color_p,color_h,color_k,color_s<br>
 <br>ExtraSectionCondition1="URL,/cgi-bin/order.cgi"
 <br>ExtraSectionFirstColumnTitle1="Product ID"
 <br>ExtraSectionFirstColumnValues1="QUERY_STRING,productid=([^&amp;]+)"
+<br>ExtraSectionFirstColumnFormat1="%s"
 <br>ExtraSectionStatTypes1=PL
+<br>ExtraSectionAddAverageRow1=0
+<br>ExtraSectionAddSumRow1=1<br>
 <br>MaxNbOfExtra1=20
 <br>MinHitExtra1=1
 
diff --git a/docs/awstats_extra.html b/docs/awstats_extra.html
index 0f2e066b..8fd02152 100644
--- a/docs/awstats_extra.html
+++ b/docs/awstats_extra.html
@@ -58,8 +58,11 @@ user or agent, etc...<br>
 <br>  extract the value used for first column. Each different value found will
 <br>  be a different row. Be sure that list of different values is "limited" to
 <br>  avoid "not enough memory" problems !
+<br>ExtraSectionFirstColumnFormatX is the string used to write value.
 <br>ExtraSectionStatTypesX are things you want to count. You can use standard
 <br>  code letters (P for pages,H for hits,B for bandwidth,L for last access).
+<br>ExtraSectionAddAverageRowX add a row at bottom of chart with average values.
+<br>ExtraSectionAddSumRowX add a row at bottom of chart with sum values.
 <br>MaxNbOfExtraX is maximum number of rows shown in chart.
 <br>MinHitExtraX is minimum number of hits required to be shown in chart.
 
@@ -81,7 +84,10 @@ ExtraSectionName1="Product orders"<br>
 ExtraSectionCondition1="URL,/cgi-bin/order.cgi"<br>
 ExtraSectionFirstColumnTitle1="Product ID"<br>
 ExtraSectionFirstColumnValues1="QUERY_STRING,productid=([^&]+)"<br>
+ExtraSectionFirstColumnFormat1="%s"<br>
 ExtraSectionStatTypes1=PL<br>
+ExtraSectionAddAverageRow1=0<br>
+ExtraSectionAddSumRow1=1<br>
 MaxNbOfExtra1=100<br>
 MinHitExtra1=1<br>
 </i>
@@ -96,7 +102,10 @@ ExtraSectionName1="Bugzilla: Most frequently viewed bugs"<br>
 ExtraSectionCondition1="URL,/bugzilla/show_bug.cgi"<br>
 ExtraSectionFirstColumnTitle1="Bug ID"<br>
 ExtraSectionFirstColumnValues1="QUERY_STRING,id=([^&]+)"<br>
+ExtraSectionFirstColumnFormat1="<a href='/bugzilla/show_bug.cgi?id=%s' target=new>%s</a>"
 ExtraSectionStatTypes1=PL<br>
+ExtraSectionAddAverageRow=0<br>
+ExtraSectionAddSumRow=1<br>
 MaxNbOfExtra1=10<br>
 MinHitExtra1=1<br>
 </i>
diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index 42e64d1a..17081a26 100644
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -1192,8 +1192,11 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 #   extract the value used for first column. Each different value found will
 #   be a different row. Be sure that list of different values is "limited" to
 #   avoid "not enough memory" problems !
+# ExtraSectionFirstColumnFormatX is the string used to write value.
 # ExtraSectionStatTypesX are things you want to count. You can use standard
 #   code letters (P for pages,H for hits,B for bandwidth,L for last access).
+# ExtraSectionAddAverageRowX add a row at bottom of chart with average values.
+# ExtraSectionAddSumRowX add a row at bottom of chart with sum values.
 # MaxNbOfExtraX is maximum number of rows shown in chart.
 # MinHitExtraX is minimum number of hits required to be shown in chart.
 #
@@ -1203,7 +1206,10 @@ color_x="C1B2E2"				# Background color for number of exit pages (Default = "C1B2
 #ExtraSectionCondition1="URL,/cgi-bin/order.cgi"
 #ExtraSectionFirstColumnTitle1="Product ID"
 #ExtraSectionFirstColumnValues1="QUERY_STRING,productid=([^&]+)"
+#ExtraSectionFirstColumnFormat1="%s"
 #ExtraSectionStatTypes1=PL
+#ExtraSectionAddAverageRow1=0
+#ExtraSectionAddSumRow1=1
 #MaxNbOfExtra1=20
 #MinHitExtra1=1
 
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 37046185..fbb0008a 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -216,9 +216,10 @@ use vars qw/
 @OnlyHosts @OnlyUserAgents @OnlyFiles 
 @URLWithQueryWithoutFollowingParameters
 @ExtraName @ExtraCondition @ExtraStatTypes @MaxNbOfExtra @MinHitExtra
-@ExtraFirstColumnTitle @ExtraFirstColumnValues
+@ExtraFirstColumnTitle @ExtraFirstColumnValues @ExtraFirstColumnFormat
 @ExtraConditionType @ExtraConditionTypeVal
 @ExtraFirstColumnValuesType @ExtraFirstColumnValuesTypeVal
+@ExtraAddAverageRow @ExtraAddSumRow
 @PluginsToLoad 
 /;
 @MiscListOrder=('AddToFavourites','JavaEnabled','DirectorSupport','FlashSupport','RealPlayerSupport','QuickTimeSupport','WindowsMediaPlayerSupport','PDFSupport');
@@ -239,9 +240,10 @@ use vars qw/
 @OnlyHosts = @OnlyUserAgents = @OnlyFiles = ();
 @URLWithQueryWithoutFollowingParameters = ();
 @ExtraName = @ExtraCondition = @ExtraStatTypes = @MaxNbOfExtra = @MinHitExtra = ();
-@ExtraFirstColumnTitle = @ExtraFirstColumnValues = ();
+@ExtraFirstColumnTitle = @ExtraFirstColumnValues = @ExtraFirstColumnFormat = ();
 @ExtraConditionType = @ExtraConditionTypeVal = ();
 @ExtraFirstColumnValuesType = @ExtraFirstColumnValuesTypeVal = ();
+@ExtraAddAverageRow = @ExtraAddSumRow = ();
 @PluginsToLoad = ();
 # ---------- Init hash arrays --------
 use vars qw/
@@ -1272,6 +1274,9 @@ sub Parse_Config {
  		if ($param =~ /^ExtraSectionStatTypes(\d+)/)    { $ExtraStatTypes[$1]=$value; next; }
  		if ($param =~ /^ExtraSectionFirstColumnTitle(\d+)/) 	{ $ExtraFirstColumnTitle[$1]=$value; next; }
  		if ($param =~ /^ExtraSectionFirstColumnValues(\d+)/) 	{ $ExtraFirstColumnValues[$1]=$value; next; }
+ 		if ($param =~ /^ExtraSectionFirstColumnFormat(\d+)/) 	{ $ExtraFirstColumnFormat[$1]=$value; next; }
+ 		if ($param =~ /^ExtraSectionAddAverageRow(\d+)/) 	{ $ExtraAddAverageRow[$1]=$value; next; }
+ 		if ($param =~ /^ExtraSectionAddSumRow(\d+)/) 	{ $ExtraAddSumRow[$1]=$value; next; }
  		if ($param =~ /^MaxNbOfExtra(\d+)/) 			{ $MaxNbOfExtra[$1]=$value; next; }
  		if ($param =~ /^MinHitExtra(\d+)/) 				{ $MinHitExtra[$1]=$value; next; }
 		# Special appearance parameters
@@ -1541,6 +1546,7 @@ sub Check_Config {
 		if ($MaxNbOfExtra[$extracpt] !~ /^\d+$/ || $MaxNbOfExtra[$extracpt]<1) { $MaxNbOfExtra[$extracpt]=20; }
 		if ($MinHitExtra[$extracpt] !~ /^\d+$/ || $MinHitExtra[$extracpt]<1) { $MinHitExtra[$extracpt]=1; }
 		if (! $ExtraFirstColumnValues[$extracpt]) { error("Extra section number $extracpt is defined without ExtraSectionFirstColumnValues$extracpt parameter"); }
+		if (! $ExtraFirstColumnFormat[$extracpt]) { $ExtraFirstColumnFormat[$extracpt] = '%s'; }
 	}
 	# Optional appearance setup section
 	if ($MaxRowsInHTMLOutput !~ /^\d+/ || $MaxRowsInHTMLOutput<1)     { $MaxRowsInHTMLOutput=1000; }
@@ -5816,7 +5822,6 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 		my $PageBool=1;
 		my $extension;
 		# Extension
-print "xxx $urlwithnoquery yyy $DefaultFile[0] zzz";
 		if ($urlwithnoquery =~ /\.(\w{1,6})$/ || ($urlwithnoquery =~ /[\\\/]$/ && $DefaultFile[0] =~ /\.(\w{1,6})$/)) {
 			$extension=lc($1);
 			if ($NotPageList{$extension}) { $PageBool=0; }
@@ -9209,7 +9214,8 @@ if (scalar keys %HTMLOutput) {
 	 		print "$Center<a name=\"EXTRA$extranum\">&nbsp;</a><BR>";
 			my $title=$ExtraName[$extranum];
 	 		&tab_head("$title",19);
-	 		print "<TR bgcolor=\"#$color_TableBGRowTitle\"><TH>".$ExtraFirstColumnTitle[$extranum]."</TH>";
+	 		print "<TR bgcolor=\"#$color_TableBGRowTitle\">";
+	 		print "<TH>".$ExtraFirstColumnTitle[$extranum]."</TH>";
 	 		if ($ExtraStatTypes[$extranum] =~ m/P/i) { print "<TH bgcolor=\"#$color_p\" width=80>$Message[56]</TH>"; }
 	 		if ($ExtraStatTypes[$extranum] =~ m/H/i) { print "<TH bgcolor=\"#$color_h\" width=80>$Message[57]</TH>"; }
 	 		if ($ExtraStatTypes[$extranum] =~ m/B/i) { print "<TH bgcolor=\"#$color_k\" width=80>$Message[75]</TH>"; }
@@ -9227,7 +9233,11 @@ if (scalar keys %HTMLOutput) {
 	 		}
 			foreach my $key (@keylist) {
 	 			my $firstcol = CleanFromCSSA(DecodeEncodedString($key));
-	 			print "<TR><TD CLASS=AWS>$firstcol</TD>";
+	 			$total_p+=${'_section_' . $extranum . '_p'}{$key};
+	 			$total_h+=${'_section_' . $extranum . '_h'}{$key};
+	 			$total_k+=${'_section_' . $extranum . '_k'}{$key};
+	 			print "<TR>";
+	 			printf("<TD CLASS=AWS>$ExtraFirstColumnFormat[$extranum]</TD>", $firstcol, $firstcol, $firstcol, $firstcol, $firstcol);
 	 			if ($ExtraStatTypes[$extranum] =~ m/P/i) { print "<TD>" . ${'_section_' . $extranum . '_p'}{$key} . "</TD>"; }
 	 			if ($ExtraStatTypes[$extranum] =~ m/H/i) { print "<TD>" . ${'_section_' . $extranum . '_h'}{$key} . "</TD>"; }
 	 			if ($ExtraStatTypes[$extranum] =~ m/B/i) { print "<TD>" . Format_Bytes(${'_section_' . $extranum . '_k'}{$key}) . "</TD>"; }
@@ -9235,6 +9245,24 @@ if (scalar keys %HTMLOutput) {
 	 			print "</TR>\n";
 	 			$count++;
 			}
+			if ($ExtraAddAverageRow[$extranum]) {
+	 			print "<TR>";
+	 			print "<TD CLASS=AWS><b>$Message[96]</b></TD>";
+	 			if ($ExtraStatTypes[$extranum] =~ m/P/i) { print "<TD>" . ($total_p/$count) . "</TD>"; }
+	 			if ($ExtraStatTypes[$extranum] =~ m/H/i) { print "<TD>" . ($total_h/$count) . "</TD>"; }
+	 			if ($ExtraStatTypes[$extranum] =~ m/B/i) { print "<TD>" . Format_Bytes(($total_k/$count)) . "</TD>"; }
+	 			if ($ExtraStatTypes[$extranum] =~ m/L/i) { print "<TD>&nbsp;</TD>"; }
+	 			print "</TR>\n";
+			}
+			if ($ExtraAddSumRow[$extranum]) {
+	 			print "<TR>";
+	 			print "<TD CLASS=AWS><b>$Message[102]</b></TD>";
+	 			if ($ExtraStatTypes[$extranum] =~ m/P/i) { print "<TD>" . ($total_p) . "</TD>"; }
+	 			if ($ExtraStatTypes[$extranum] =~ m/H/i) { print "<TD>" . ($total_h) . "</TD>"; }
+	 			if ($ExtraStatTypes[$extranum] =~ m/B/i) { print "<TD>" . Format_Bytes($total_k) . "</TD>"; }
+	 			if ($ExtraStatTypes[$extranum] =~ m/L/i) { print "<TD>&nbsp;</TD>"; }
+	 			print "</TR>\n";
+			}
 	 		&tab_end;
 	 	}