Added support for AND conditions in extra sections.

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index e9ccb7ab704aa8113c4ce32399349491791f1347..d9f9ba35ea141aae8ec051ab621bd1ec7ea1f206 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -29,6 +29,7 @@ New features/improvements:
 - A new search engine database to allow several "match id" for same
   search engine. Example: All google ip referer id are recognised.
 - Can use UA and HOST fields to build personalized ExtraSection reports.
+- Added support for AND conditions in personlaized ExtraSection config.
 - Support for right to left languages. Added 'he' language.
 - Added LevelForSearchEnginesDetection parameter to choose between 2 possible
   levels of detection for search engines (like LevelForRobotsDetection).

diff --git a/docs/awstats_config.html b/docs/awstats_config.html
index 9c22a9eb9030c249df20f825825d5f9fa75facf8..58a7a23f218d31cba55513e16ee95166d881149a 100644 (file)
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -1660,7 +1660,8 @@ color_u,color_v,color_p,color_h,color_k,color_s<br>
 <br># ExtraSectionNameX is title of your personalized chart.
 <br># ExtraSectionConditionalX are conditions you can use to count or not the hit,
 <br>#   Use one of the field condition (URL, QUERY_STRING, REFERER, UA, HOST)
-<br>#   and string to match after a coma. Use "|" for "OR".
+<br>#   and string to match after a coma. Use "|" for "OR". If you can also use
+<br>#   several conditions, they will be combined as "AND".
 <br># ExtraSectionFirstColumnTitleX is the first column title of the chart.
 <br># ExtraSectionFirstColumnValuesX is a Regex string to tell AWStats in which 
 <br>#   field to extract value from (URL, QUERY_STRING, REFERER, UA, HOST) and how
@@ -1678,7 +1679,7 @@ color_u,color_v,color_p,color_h,color_k,color_s<br>
 <br>
 <br># Example to report the 20 products the most ordered by "order.cgi" script
 <br>ExtraSectionName1="Product orders"
-<br>ExtraSectionCondition1="URL,/cgi-bin/order.cgi"
+<br>ExtraSectionCondition1="URL,/cgi-bin/order.cgi|URL,/cgi-bin/order2.cgi"
 <br>ExtraSectionFirstColumnTitle1="Product ID"
 <br>ExtraSectionFirstColumnValues1="QUERY_STRING,productid=([^&amp;]+)"
 <br>ExtraSectionFirstColumnFormat1="%s"

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index ea7ae0604189760ea601a4eb4346d125c05bacb5..fb7c13c8739dd6dfc92a765eb53a38eaabe667e0 100644 (file)
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -1258,7 +1258,8 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 # ExtraSectionNameX is title of your personalized chart.
 # ExtraSectionConditionalX are conditions you can use to count or not the hit,
 #   Use one of the field condition (URL, QUERY_STRING, REFERER, UA, HOST)
-#   and string to match after a coma. Use "|" for "OR".
+#   and string to match after a coma. Use "|" for "OR". If you can also use
+#   several conditions, they will be combined as "AND".
 # ExtraSectionFirstColumnTitleX is the first column title of the chart.
 # ExtraSectionFirstColumnValuesX is a Regex string to tell AWStats in which 
 #   field to extract value from (URL, QUERY_STRING, REFERER, UA, HOST) and how
@@ -1276,7 +1277,7 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 
 # Example to report the 20 products the most ordered by "order.cgi" script
 #ExtraSectionName1="Product orders"
-#ExtraSectionCondition1="URL,/cgi-bin/order.cgi"
+#ExtraSectionCondition1="URL,/cgi-bin/order.cgi|URL,/cgi-bin/order2.cgi"
 #ExtraSectionFirstColumnTitle1="Product ID"
 #ExtraSectionFirstColumnValues1="QUERY_STRING,productid=([^&]+)"
 #ExtraSectionFirstColumnFormat1="%s"