version 1.346, 2015/06/16 20:24:39
|
version 1.354, 2020/08/26 00:42:39
|
Line 479 sub setup_basic_search {
|
Line 479 sub setup_basic_search {
|
.&mt('use related words') |
.&mt('use related words') |
.'</label>'; |
.'</label>'; |
|
|
|
my $anydom = 1; |
|
if ($area eq 'res') { |
|
unless (&Apache::lonnet::allowed('bre','/res/') eq 'F') { |
|
$anydom = 0; |
|
} |
|
} |
|
my $singledom; |
|
my ($disabled,$checked); |
|
if ($anydom) { |
|
$singledom = $r->dir_config('lonDefDomain'); |
|
if ($env{'form.domains'} eq $singledom) { |
|
$checked = 1; |
|
} |
|
} else { |
|
$singledom = $env{'user.domain'}; |
|
$disabled = ' disabled="disabled"'; |
|
$checked = 1; |
|
} |
$onlysearchdomain = '<label>' |
$onlysearchdomain = '<label>' |
.&Apache::lonhtmlcommon::checkbox( |
.&Apache::lonhtmlcommon::checkbox( |
'domains', |
'domains',$checked, |
$env{'form.domains'}, |
$singledom,$disabled) |
$r->dir_config('lonDefDomain')) |
|
.' ' |
.' ' |
.&mt('only search domain [_1]' |
.&mt('only search domain [_1]' |
,'<b>'.$r->dir_config('lonDefDomain').'</b>') |
,'<b>'.$singledom.'</b>') |
.'</label>'; |
.'</label>'; |
|
|
$adv_search_link = '<a href="/adm/searchcat?'. |
$adv_search_link = '<a href="/adm/searchcat?'. |
Line 661 function additional_metadata() {
|
Line 678 function additional_metadata() {
|
$env{'form.category'}) |
$env{'form.category'}) |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure(); |
|
|
$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains'))) |
my $anydomain = 1; |
.&Apache::loncommon::domain_select('domains', |
if ($env{'form.area'} ne 'portfolio') { |
$env{'form.domains'},1) |
unless (&Apache::lonnet::allowed('bre','/res/')) { |
.&Apache::lonhtmlcommon::row_closure(); |
$anydomain = 0; |
|
} |
|
} |
|
|
|
$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains'))); |
|
if ($anydomain) { |
|
my $defdom = &Apache::lonnet::default_login_domain(); |
|
my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('shared',$defdom); |
|
$scrout .= &Apache::loncommon::domain_select('domains', |
|
$env{'form.domains'},1,$trusted,$untrusted); |
|
} else { |
|
$scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'}, |
|
'domains','','','',[$env{'user.domain'}],'',1); |
|
} |
|
$scrout .= &Apache::lonhtmlcommon::row_closure(); |
|
|
# Misc metadata |
# Misc metadata |
if ($env{'form.area'} ne 'portfolio') { |
if ($env{'form.area'} ne 'portfolio') { |
Line 1852 sub build_date_queries {
|
Line 1883 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 1870 sub build_date_queries {
|
Line 1903 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 1912 sub copyright_check {
|
Line 1947 sub copyright_check {
|
my (undef,undef,$resdom,$resname) = split('/', |
my (undef,undef,$resdom,$resname) = split('/', |
$Metadata->{'url'}); |
$Metadata->{'url'}); |
# Check for priv |
# Check for priv |
if (($Metadata->{'copyright'} eq 'priv') && |
if ($Metadata->{'copyright'} eq 'priv') { |
(($env{'user.name'} ne $resname) && |
unless (($env{'user.name'} eq $resname) && |
($env{'user.domain'} ne $resdom))) { |
($env{'user.domain'} eq $resdom)) { |
return 0; |
return 0; |
|
} |
} |
} |
# Check for domain |
# Check for domain |
if (($Metadata->{'copyright'} eq 'domain') && |
if (($Metadata->{'copyright'} eq 'domain') && |
Line 2370 END
|
Line 2406 END
|
%all_library_servers = (%library_servers,%older_library_servers); |
%all_library_servers = (%library_servers,%older_library_servers); |
@Servers_to_contact = sort(keys(%all_library_servers)); |
@Servers_to_contact = sort(keys(%all_library_servers)); |
foreach my $server (@Servers_to_contact) { |
foreach my $server (@Servers_to_contact) { |
my %possdoms; |
|
map { $possdoms{$_}=1; } &Apache::lonnet::machine_domains($all_library_servers{$server}); |
|
$domains_by_server{$server} = |
$domains_by_server{$server} = |
join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server}))); |
join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server}))); |
} |
} |
Line 2411 END
|
Line 2445 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 2535 END
|
Line 2570 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 3332 sub detailed_citation_view {
|
Line 3369 sub detailed_citation_view {
|
'<b>'.$prefix. |
'<b>'.$prefix. |
'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.' '. |
'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.' '. |
'<a href="'.$jumpurl.'?inhibitmenu=yes" '. |
'<a href="'.$jumpurl.'?inhibitmenu=yes" '. |
'target="preview">'.$values{'title'}."</a></b>\n". |
'target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}."</a></b>\n". |
&display_tools($values{'title'}, $jumpurl). |
&display_tools($values{'title'}, $jumpurl). |
"<p>\n". |
"<p>\n". |
'<b>'.$values{'author'}.'</b>,'. |
'<b>'.$values{'author'}.'</b>,'. |
Line 3465 sub summary_view {
|
Line 3502 sub summary_view {
|
my $link = '<br />'.&display_url($jumpurl,1).'<br />'; |
my $link = '<br />'.&display_url($jumpurl,1).'<br />'; |
$result .= |
$result .= |
'<a href="'.$jumpurl.'?inhibitmenu=yes"'. |
'<a href="'.$jumpurl.'?inhibitmenu=yes"'. |
' target="preview">'.$values{'title'}.'</a>'. |
' target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}.'</a>'. |
&display_tools($values{'title'}, $jumpurl).<<END; |
&display_tools($values{'title'}, $jumpurl).<<END; |
<br /> |
<br /> |
$link<br /> |
$link<br /> |
Line 3511 sub compact_view {
|
Line 3548 sub compact_view {
|
} |
} |
$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"'); |
$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"'); |
$result.=' <span class="LC_nobreak">'. |
$result.=' <span class="LC_nobreak">'. |
'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'. |
'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'. |
&HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '. |
&HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '. |
&display_tools($values{'title'}, $jumpurl). |
&display_tools($values{'title'}, $jumpurl). |
$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')'; |
$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')'; |
Line 3527 sub display_url {
|
Line 3564 sub display_url {
|
} elsif ($url=~m{^(http://|/uploaded/)}) { |
} elsif ($url=~m{^(http://|/uploaded/)}) { |
$link='<span class="LC_filename">'.$url.'</span>'; |
$link='<span class="LC_filename">'.$url.'</span>'; |
} else { |
} else { |
|
# 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) |
|
my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\""; |
$link=&Apache::lonhtmlcommon::crumbs( |
$link=&Apache::lonhtmlcommon::crumbs( |
$url, |
$url, |
'preview', |
'preview', |
'', |
'', |
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''), |
'', |
$skiplast).' '; |
$skiplast,$onclick).' '; |
} |
} |
return $link; |
return $link; |
} |
} |