Added LevelForKeywordsDetection parameter.

diff --git a/docs/awstats_config.html b/docs/awstats_config.html
index de67906df4e0e2733a21e9abe96d02ecdc765873..ea3720db05364048b9f44f6902cf03d5e7adf6b1 100644 (file)
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -112,6 +112,7 @@ when reading it), follow the example:<br>
 <li><a href="#LevelFor">LevelForRefererAnalyze</a>
 <li><a href="#LevelFor">LevelForRobotsDetection</a>
 <li><a href="#LevelFor">LevelForSearchEnginesDetection</a>
+<li><a href="#LevelFor">LevelForKeywordsDetection</a>
 <li><a href="#LevelFor">LevelForFileTypesDetection</a>
 <li><a href="#LevelFor">LevelForWormsDetection</a>
 
@@ -1177,7 +1178,7 @@ AWStats 4.1+ supports both keywords AND keyphrases by default with no need of an
 
 <a name="LevelFor"><b>LevelFor</b></a><br>
 <b>Version : </b>4.0+<br>
-6.0+ for LevelForFileTypesDetection, LevelForSearchEnginesDetection<br>
+6.0+ for LevelForFileTypesDetection, LevelForSearchEnginesDetection, LevelForKeywordsDetection, LevelForWormsDetection<br>
 <br># Following values allows you to define accuracy of AWStats entities (robots,
 <br># browsers, os, referers, file types) detection.
 <br># It is recommanded that very important web sites or ISP that provides AWStats
@@ -1191,9 +1192,10 @@ AWStats 4.1+ supports both keywords AND keyphrases by default with no need of an
 <br>#
 <br>LevelForBrowsersDetection=2                        # 0 disables Browsers detection.
 <br>LevelForOSDetection=2                              # 0 disables OS detection.
-<br>LevelForRefererAnalyze=2                   # 0 disables origin detection.
+<br>LevelForRefererAnalyze=2                   # 0 disables Origin detection.
 <br>LevelForRobotsDetection=2                  # 0 disables Robots detection.
 <br>LevelForSearchEnginesDetection=2   # 0 disables Search engines detection.
+<br>LevelForKeywordsDetection=2                        # 0 disables Keyphrases/Keywords detection.
 <br>LevelForFileTypesDetection=2               # 0 disables file types detection.
 <br>LevelForWormsDetection=0                   # 0 disables Worms detection.
 

diff --git a/tools/webmin/awstats/edit_config.cgi b/tools/webmin/awstats/edit_config.cgi
index bfe25cb6d18352879c2a3f56780164d1b4adeba4..8a2d4d98440d0736c934c653d6b701e74e57b1e2 100644 (file)
--- a/tools/webmin/awstats/edit_config.cgi
+++ b/tools/webmin/awstats/edit_config.cgi
@@ -226,14 +226,18 @@ print "<tr> <td colspan=3><br></td> </tr>\n";
 
 print "<tr> <td colspan=3><br>OPTIONAL ACCURACY SETUP SECTION (Not required but increase AWStats features)<br><hr></td> </tr>\n";
 if ($in{'advanced'} == 2) {
-       print "<tr> <td><b>LevelForRobotsDetection</b></td> <td> <input size=10 type=text name=LevelForRobotsDetection value='$lconf->{'LevelForRobotsDetection'}'> </td> <td> ";
-       print &hblink($text{'help_help'}, "help.cgi?param=LevelForRobotsDetection")." </td> </tr>\n";
        print "<tr> <td><b>LevelForBrowsersDetection</b></td> <td> <input size=10 type=text name=LevelForBrowsersDetection value='$lconf->{'LevelForBrowsersDetection'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=LevelForBrowsersDetection")." </td> </tr>\n";
        print "<tr> <td><b>LevelForOSDetection</b></td> <td> <input size=10 type=text name=LevelForOSDetection value='$lconf->{'LevelForOSDetection'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=LevelForOSDetection")." </td> </tr>\n";
        print "<tr> <td><b>LevelForRefererAnalyze</b></td> <td> <input size=10 type=text name=LevelForRefererAnalyze value='$lconf->{'LevelForRefererAnalyze'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=LevelForRefererAnalyze")." </td> </tr>\n";
+       print "<tr> <td><b>LevelForRobotsDetection</b></td> <td> <input size=10 type=text name=LevelForRobotsDetection value='$lconf->{'LevelForRobotsDetection'}'> </td> <td> ";
+       print &hblink($text{'help_help'}, "help.cgi?param=LevelForRobotsDetection")." </td> </tr>\n";
+       print "<tr> <td><b>LevelForSearchEnginesDetection</b></td> <td> <input size=10 type=text name=LevelForSearchEnginesDetection value='$lconf->{'LevelForSearchEnginesDetection'}'> </td> <td> ";
+       print &hblink($text{'help_help'}, "help.cgi?param=LevelForSearchEnginesDetection")." </td> </tr>\n";
+       print "<tr> <td><b>LevelForKeywordsDetection</b></td> <td> <input size=10 type=text name=LevelForKeywordsDetection value='$lconf->{'LevelForKeywordsDetection'}'> </td> <td> ";
+       print &hblink($text{'help_help'}, "help.cgi?param=LevelForKeywordsDetection")." </td> </tr>\n";
        print "<tr> <td><b>LevelForFileTypesDetection</b></td> <td> <input size=10 type=text name=LevelForFileTypesDetection value='$lconf->{'LevelForFileTypesDetection'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=LevelForFileTypesDetection")." </td> </tr>\n";
        print "<tr> <td><b>LevelForWormsDetection</b></td> <td> <input size=10 type=text name=LevelForWormsDetection value='$lconf->{'LevelForWormsDetection'}'> </td> <td> ";

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index dd4dad8db9831dc062170c4cb09f9f139604826e..6336d55487e7dc1f1ffeba924bb6601d446152e1 100644 (file)
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -780,6 +780,7 @@ LevelForOSDetection=2                                       # 0 disables OS detection.
 LevelForRefererAnalyze=2                               # 0 disables Origin detection.
 LevelForRobotsDetection=2                              # 0 disables Robots detection.
 LevelForSearchEnginesDetection=2               # 0 disables Search engines detection.
+LevelForKeywordsDetection=2                            # 0 disables Keyphrases/Keywords detection.
 LevelForFileTypesDetection=2                   # 0 disables File types detection.
 LevelForWormsDetection=0                               # 0 disables Worms detection.
 

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index f83cc13dedb6f0ac448e262ae664b6de6d97d30d..d83bb8a5ba4f295dd01f35f7728d31d56e62c2c1 100644 (file)
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -6504,40 +6504,43 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {        # Updat
                                                        $_from_h[2]++;
                                                        $_se_referrals_h{$TmpRefererServer{$refererserver}}++;
                                                        $found=1;
-                                                       my @refurl=split(/\?/,$field[$pos_referer],2);  # TODO Use \? or [$URLQuerySeparators] ?
-                                                       if ($refurl[1]) {
-                                                               # Extract params of referer query string (q=cache:mmm:www/zzz+aaa+bbb q=aaa+bbb/ccc key=ddd%20eee lang_en ie=UTF-8 ...)
-                                                               my @paramlist=split(/&/,$KeyWordsNotSensitive?lc($refurl[1]):$refurl[1]);
-                                                               if ($SearchEnginesKnownUrl{$TmpRefererServer{$refererserver}}) {        # Search engine with known URL syntax
-                                                                       foreach my $param (@paramlist) {
-                                                                               if ($param =~ s/^$SearchEnginesKnownUrl{$TmpRefererServer{$refererserver}}//) {
+                                                       if ($LevelForKeywordsDetection) {
+                                                               my @refurl=split(/\?/,$field[$pos_referer],2);  # TODO Use \? or [$URLQuerySeparators] ?
+                                                               if ($refurl[1]) {
+                                                                       # Extract params of referer query string (q=cache:mmm:www/zzz+aaa+bbb q=aaa+bbb/ccc key=ddd%20eee lang_en ie=UTF-8 ...)
+                                                                       if ($SearchEnginesKnownUrl{$TmpRefererServer{$refererserver}}) {        # Search engine with known URL syntax
+                                                                               my @paramlist=split(/&/,$KeyWordsNotSensitive?lc($refurl[1]):$refurl[1]);
+                                                                               foreach my $param (@paramlist) {
+                                                                                       if ($param =~ s/^$SearchEnginesKnownUrl{$TmpRefererServer{$refererserver}}//) {
+                                                                                               # We found good parameter
+                                                                                               # Now param is keyphrase: "cache:mmm:www/zzz+aaa+bbb/ccc+ddd%20eee'fff,ggg"
+                                                                                               $param =~ s/^(cache|related):[^\+]+//;
+                                                                                               &ChangeWordSeparatorsIntoSpace($param);         # Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg]
+                                                                                               $param =~ s/^ +//; $param =~ s/ +$//; $param =~ tr/ /\+/s;
+                                                                                               if ((length $param) > 0) { $_keyphrases{$param}++; }
+                                                                                               last;
+                                                                                       }
+                                                                               }
+                                                                       }
+                                                                       elsif ($LevelForKeywordsDetection >= 2) {                                                       # Search engine with unknown URL syntax
+                                                                               my @paramlist=split(/&/,$KeyWordsNotSensitive?lc($refurl[1]):$refurl[1]);
+                                                                               foreach my $param (@paramlist) {
+                                                                                       my $foundexcludeparam=0;
+                                                                                       foreach my $paramtoexclude (@WordsToCleanSearchUrl) {
+                                                                                               if ($param =~ /$paramtoexclude/i) { $foundexcludeparam=1; last; } # Not the param with search criteria
+                                                                                       }
+                                                                                       if ($foundexcludeparam) { next; }
                                                                                        # We found good parameter
-                                                                                       # Now param is keyphrase: "cache:mmm:www/zzz+aaa+bbb/ccc+ddd%20eee'fff,ggg"
+                                                                                       $param =~ s/.*=//;
+                                                                                       # Now param is keyphrase: "aaa+bbb/ccc+ddd%20eee'fff,ggg"
                                                                                        $param =~ s/^(cache|related):[^\+]+//;
-                                                                                       &ChangeWordSeparatorsIntoSpace($param);         # Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg]
+                                                                                       &ChangeWordSeparatorsIntoSpace($param);                 # Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg ]
                                                                                        $param =~ s/^ +//; $param =~ s/ +$//; $param =~ tr/ /\+/s;
-                                                                                       if ((length $param) > 0) { $_keyphrases{$param}++; }
-                                                                                       last;
+                                                                                       if ((length $param) > 2) { $_keyphrases{$param}++; last; }
                                                                                }
                                                                        }
-                                                               }
-                                                               else {                                                                                                                          # Search engine with unknown URL syntax
-                                                                       foreach my $param (@paramlist) {
-                                                                               my $foundexcludeparam=0;
-                                                                               foreach my $paramtoexclude (@WordsToCleanSearchUrl) {
-                                                                                       if ($param =~ /$paramtoexclude/i) { $foundexcludeparam=1; last; } # Not the param with search criteria
-                                                                               }
-                                                                               if ($foundexcludeparam) { next; }
-                                                                               # We found good parameter
-                                                                               $param =~ s/.*=//;
-                                                                               # Now param is keyphrase: "aaa+bbb/ccc+ddd%20eee'fff,ggg"
-                                                                               $param =~ s/^(cache|related):[^\+]+//;
-                                                                               &ChangeWordSeparatorsIntoSpace($param);                 # Change [ aaa+bbb/ccc+ddd%20eee'fff,ggg ] into [ aaa bbb/ccc ddd eee fff ggg ]
-                                                                               $param =~ s/^ +//; $param =~ s/ +$//; $param =~ tr/ /\+/s;
-                                                                               if ((length $param) > 2) { $_keyphrases{$param}++; last; }
-                                                                       }
-                                                               }
-                                                       }       # End of if refurl[1]
+                                                               }       # End of if refurl[1]
+                                                       }
                                                }
                                        }       # End of if ($TmpRefererServer)
                                        else {