version 1.331.4.13, 2016/11/09 19:37:39
|
version 1.331.4.16, 2020/08/26 01:29:48
|
Line 1881 sub build_date_queries {
|
Line 1881 sub build_date_queries {
|
my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore); |
my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore); |
# Correct for year being relative to 1900 |
# Correct for year being relative to 1900 |
$cayear+=1900; $cbyear+=1900; |
$cayear+=1900; $cbyear+=1900; |
|
# Correct month; localtime gives month 0..11 but MySQL expects 1..12 |
|
$camon++; $cbmon++; |
my $cquery= |
my $cquery= |
'(creationdate BETWEEN '. |
'(creationdate BETWEEN '. |
"'".$cayear.'-'.$camon.'-'.$caday."'". |
"'".$cayear.'-'.$camon.'-'.$caday."'". |
Line 1899 sub build_date_queries {
|
Line 1901 sub build_date_queries {
|
my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore); |
my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore); |
# Correct for year being relative to 1900 |
# Correct for year being relative to 1900 |
$mayear+=1900; $mbyear+=1900; |
$mayear+=1900; $mbyear+=1900; |
|
# Correct month; localtime gives month 0..11 but MySQL expects 1..12 |
|
$mamon++; $mbmon++; |
my $mquery= |
my $mquery= |
'(lastrevisiondate BETWEEN '. |
'(lastrevisiondate BETWEEN '. |
"'".$mayear.'-'.$mamon.'-'.$maday."'". |
"'".$mayear.'-'.$mamon.'-'.$maday."'". |
Line 2455 END
|
Line 2459 END
|
## Prepare for the big loop. |
## Prepare for the big loop. |
my $hitcountsum; |
my $hitcountsum; |
my $oldhitcountsum; |
my $oldhitcountsum; |
|
my $displaycount; |
my %matches; |
my %matches; |
my $server; |
my $server; |
my $status; |
my $status; |
Line 2579 END
|
Line 2584 END
|
last if ($connection->aborted()); |
last if ($connection->aborted()); |
if ($oldhitcountsum < $hitcountsum) { |
if ($oldhitcountsum < $hitcountsum) { |
&update_count_status($r,$hitcountsum); |
&update_count_status($r,$hitcountsum); |
if ($hitcountsum <= $env{'form.show'}) { |
if (($hitcountsum <= $env{'form.show'}) || |
|
(!$displaycount && $hitcountsum)) { |
reload_result_frame($r); |
reload_result_frame($r); |
|
$displaycount = $hitcountsum; |
} |
} |
$oldhitcountsum = $hitcountsum; |
$oldhitcountsum = $hitcountsum; |
} |
} |
Line 3582 sub display_url {
|
Line 3589 sub display_url {
|
$url, |
$url, |
'preview', |
'preview', |
'', |
'', |
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''), |
'', |
$skiplast,$onclick).' '; |
$skiplast,$onclick).' '; |
# replace the links to open in a new window |
|
# (because the search opens in a new window, it gets |
|
# confusing when the links open a tab in the |
|
# parent window; ideally we should not force windows) |
|
$link =~ s/(href="[^"]*")/\1 onclick="window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;"/g; |
|
} |
} |
return $link; |
return $link; |
} |
} |