) {
- # TODO Change archiveok to 0 if pb during writing
-# if (! print ARCHIVELOG $_) { $archiveok=0; last; }
- print ARCHIVELOG $_;
+# print ARCHIVELOG $_;
+ if (! print ARCHIVELOG $_) { $archiveok=0; last; }
}
close(ARCHIVELOG) || error("Error: Archiving failed during closing archive: $!");
if ($SaveDatabaseFilesWithPermissionsForEveryone) { chmod 0666,"$ArchiveFileName"; }
@@ -3914,10 +3989,14 @@ EOF
if (!$TotalBytesPages) { foreach my $key (keys %_url_k) { $TotalBytesPages+=$_url_k{$key}; } }
# TotalKeyphrases (if not already specifically counted, we init it from _keyphrases hash table)
if (!$TotalKeyphrases) { foreach my $key (keys %_keyphrases) { $TotalKeyphrases+=$_keyphrases{$key}; } }
+ # TotalKeywords (if not already specifically counted, we init it from _keywords hash table)
+ if (!$TotalKeywords) { foreach my $key (keys %_keywords) { $TotalKeywords+=$_keywords{$key}; } }
# TotalDifferentPages (if not already specifically counted, we init it from _url_p hash table)
if (!$TotalDifferentPages) { $TotalDifferentPages=scalar keys %_url_p; }
# TotalDifferentKeyphrases (if not already specifically counted, we init it from _keyphrases hash table)
if (!$TotalDifferentKeyphrases) { $TotalDifferentKeyphrases=scalar keys %_keyphrases; }
+ # TotalDifferentKeywords (if not already specifically counted, we init it from _keywords hash table)
+ if (!$TotalDifferentKeywords) { $TotalDifferentKeywords=scalar keys %_keywords; }
# Define firstdaytocountaverage, lastdaytocountaverage, firstdaytoshowtime, lastdaytoshowtime
my $firstdaytocountaverage=$nowyear.$nowmonth."01"; # Set day cursor to 1st day of month
my $firstdaytoshowtime=$nowyear.$nowmonth."01"; # Set day cursor to 1st day of month
@@ -3975,6 +4054,7 @@ EOF
if ($ShowMonthDayStats) { print "$Message[5]/$Message[4] "; }
if ($ShowDaysOfWeekStats) { print "$Message[91] "; }
if ($ShowHoursStats) { print "$Message[20] "; }
+ print "
";
# Who
print "| $Message[92] : | ";
print "";
@@ -3990,26 +4070,30 @@ EOF
print " |
|---|
| $Message[72] : | ";
print "";
if ($ShowSessionsStats) { print "$Message[117] "; }
- if ($ShowPagesStats) { print "$Message[29] "; }
+ if ($ShowPagesStats) { print "$Message[29] \n"; }
if ($ShowPagesStats) { print "$Message[104] "; }
if ($ShowPagesStats) { print "$Message[116] "; }
if ($ShowFileTypesStats) { print "$Message[73] "; }
if ($ShowFileSizesStats) { }
if ($ShowOSStats) { print "$Message[59] "; }
if ($ShowBrowsersStats) { print "$Message[21] "; }
- if ($ShowBrowsersStats) { print "$Message[33] "; }
- if ($ShowBrowsersStats) { print "$Message[34]
|
|---|
\n"; }
+ if ($ShowBrowsersStats) { print "$Message[33] \n"; }
+ if ($ShowBrowsersStats) { print "$Message[34] \n"; }
+ print "
";
# Referers
print "| $Message[23] : | ";
print "";
- if ($ShowOriginStats) { print "$Message[37] "; }
- if ($ShowKeyphrasesStats) { print "$Message[24]
|
|---|
\n"; }
+ if ($ShowOriginStats) { print "$Message[37] \n"; }
+ if ($ShowKeyphrasesStats) { print "$Message[120] \n"; }
+ if ($ShowKeywordsStats) { print "$Message[121] \n"; }
+ print "
";
# Others
print "| $Message[2] : | ";
print "";
if ($ShowCompressionStats) { print "$Message[98] "; }
if ($ShowHTTPErrorsStats) { print "$Message[22] "; }
- if ($ShowHTTPErrorsStats) { print "$Message[31]
|
|---|
\n"; }
+ if ($ShowHTTPErrorsStats) { print "$Message[31]\n"; }
+ print "
";
}
else { # If not main page
$NewLinkParams =~ s/urlfilter[=]*[^ &]*//i;
@@ -4285,7 +4369,7 @@ EOF
print "| $TotalDifferentKeyphrases $Message[103] | $Message[14] | $Message[15] |
|---|
\n";
$total_s=0;
my $count=0;
- &BuildKeyList($MaxRowsInHTMLOutput,$MinHitKeyword,\%_keyphrases,\%_keyphrases);
+ &BuildKeyList($MaxRowsInHTMLOutput,$MinHitKeyphrase,\%_keyphrases,\%_keyphrases);
foreach my $key (@keylist) {
my $mot = DecodeEncodedString(CleanFromCSSA($key));
my $p;
@@ -4306,6 +4390,33 @@ EOF
&html_end;
exit(0);
}
+ if ($QueryString =~ /output=allkeywords/i) {
+ print "$CENTER
";
+ &tab_head($Message[44],19);
+ print "| $TotalDifferentKeywords $Message[13] | $Message[14] | $Message[15] |
|---|
\n";
+ $total_s=0;
+ my $count=0;
+ &BuildKeyList($MaxRowsInHTMLOutput,$MinHitKeyword,\%_keywords,\%_keywords);
+ foreach my $key (@keylist) {
+ my $mot = DecodeEncodedString(CleanFromCSSA($key));
+ my $p;
+ if ($TotalKeywords) { $p=int($_keywords{$key}/$TotalKeywords*1000)/10; }
+ print "| $mot | $_keywords{$key} | $p % |
\n";
+ $total_s += $_keywords{$key};
+ $count++;
+ }
+ if ($Debug) { debug("Total real / shown : $TotalKeywords / $total_s",2); }
+ $rest_s=$TotalKeywords-$total_s;
+ if ($rest_s > 0) {
+ my $p;
+ if ($TotalKeywords) { $p=int($rest_s/$TotalKeywords*1000)/10; }
+ print "| $Message[30] | $rest_s | ";
+ print "$p % |
\n";
+ }
+ &tab_end;
+ &html_end;
+ exit(0);
+ }
if ($QueryString =~ /output=errors404/i) {
print "$CENTER
";
&tab_head($Message[47],19);
@@ -5053,17 +5164,20 @@ EOF
&tab_end;
}
- # BY SEARCH PHRASES
- #----------------------------
+ # BY SEARCH KEYWORDS AND/OR KEYPHRASES
+ #-------------------------------------
+ if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print ""; }
if ($ShowKeyphrasesStats) {
+ # By Keyphrases
+ if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print "\n"; }
if ($Debug) { debug("ShowKeyphrasesStats",2); }
print "$CENTER
";
- $MaxNbOfKeywordsShown = $TotalDifferentKeyphrases if $MaxNbOfKeywordsShown > $TotalDifferentKeyphrases;
- &tab_head("$Message[43] ($Message[77] $MaxNbOfKeywordsShown) - $Message[80]",19);
+ $MaxNbOfKeyphrasesShown = $TotalDifferentKeyphrases if $MaxNbOfKeyphrasesShown > $TotalDifferentKeyphrases;
+ &tab_head("$Message[43] ($Message[77] $MaxNbOfKeyphrasesShown)
$Message[80]",19);
print " |
| $TotalDifferentKeyphrases $Message[103] | $Message[14] | $Message[15] |
|---|
\n";
$total_s=0;
my $count=0;
- &BuildKeyList($MaxNbOfKeywordsShown,$MinHitKeyword,\%_keyphrases,\%_keyphrases);
+ &BuildKeyList($MaxNbOfKeyphrasesShown,$MinHitKeyphrase,\%_keyphrases,\%_keyphrases);
foreach my $key (@keylist) {
my $mot = DecodeEncodedString(CleanFromCSSA($key));
my $p;
@@ -5080,7 +5194,38 @@ EOF
print "$p % | \n";
}
&tab_end;
+ if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print "\n"; }
+ }
+ if ($ShowKeywordsStats) {
+ # By Keywords
+ if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print "\n"; }
+ if ($Debug) { debug("ShowKeywordsStats",2); }
+ print "$CENTER
";
+ $MaxNbOfKeywordsShown = $TotalDifferentKeywords if $MaxNbOfKeywordsShown > $TotalDifferentKeywords;
+ &tab_head("$Message[44] ($Message[77] $MaxNbOfKeywordsShown)
$Message[80]",19);
+ print " | | $TotalDifferentKeywords $Message[13] | $Message[14] | $Message[15] |
|---|
\n";
+ $total_s=0;
+ my $count=0;
+ &BuildKeyList($MaxNbOfKeywordsShown,$MinHitKeyword,\%_keywords,\%_keywords);
+ foreach my $key (@keylist) {
+ my $mot = DecodeEncodedString(CleanFromCSSA($key));
+ my $p;
+ if ($TotalKeywords) { $p=int($_keywords{$key}/$TotalKeywords*1000)/10; }
+ print "| $mot | $_keywords{$key} | $p % |
\n";
+ $total_s += $_keywords{$key};
+ $count++;
+ }
+ $rest_s=$TotalKeywords-$total_s;
+ if ($rest_s > 0) {
+ my $p;
+ if ($TotalKeywords) { $p=int($rest_s/$TotalKeywords*1000)/10; }
+ print "| $Message[30] | $rest_s | ";
+ print "$p % |
\n";
+ }
+ &tab_end;
+ if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print "\n"; }
}
+ if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print "
"; }
# BY ERRORS
#----------------------------