version 1.258, 2006/03/19 22:08:38
|
version 1.266, 2006/06/08 07:20:41
|
Line 78 use HTML::Entities();
|
Line 78 use HTML::Entities();
|
use Parse::RecDescent; |
use Parse::RecDescent; |
use Apache::lonnavmaps; |
use Apache::lonnavmaps; |
use Apache::lonindexer(); |
use Apache::lonindexer(); |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
Line 153 sub handler {
|
Line 155 sub handler {
|
## |
## |
my $domain = $r->dir_config('lonDefDomain'); |
my $domain = $r->dir_config('lonDefDomain'); |
$diropendb= "/home/httpd/perl/tmp/". |
$diropendb= "/home/httpd/perl/tmp/". |
"$env{'user.domain'}_$env{'user.name'}_searchcat.db"; |
"$env{'user.domain'}_$env{'user.name'}_sel_res.db"; |
# |
# |
# set the name of the persistent database |
# set the name of the persistent database |
# $env{'form.persistent_db_id'} can only have digits in it. |
# $env{'form.persistent_db_id'} can only have digits in it. |
Line 164 sub handler {
|
Line 166 sub handler {
|
} |
} |
|
|
my $persistent_db_file = "/home/httpd/perl/tmp/". |
my $persistent_db_file = "/home/httpd/perl/tmp/". |
&Apache::lonnet::escape($domain). |
&escape($domain). |
'_'.&Apache::lonnet::escape($env{'user.name'}). |
'_'.&escape($env{'user.name'}). |
'_'.$env{'form.persistent_db_id'}.'_persistent_search.db'; |
'_'.$env{'form.persistent_db_id'}.'_persistent_search.db'; |
## |
## |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
Line 199 sub handler {
|
Line 201 sub handler {
|
'We were unable to retrieve data describing your search. '. |
'We were unable to retrieve data describing your search. '. |
'This is a serious error and has been logged. '. |
'This is a serious error and has been logged. '. |
'Please alert your LON-CAPA administrator.'; |
'Please alert your LON-CAPA administrator.'; |
return &error_page($r,$msg); |
&Apache::loncommon::simple_error_page($r,'Search Error', |
|
$msg); |
|
return OK; |
} |
} |
} |
} |
} else { |
} else { |
Line 220 sub handler {
|
Line 224 sub handler {
|
# This is a stupid error to give to the user. |
# This is a stupid error to give to the user. |
# It really tells them nothing. |
# It really tells them nothing. |
my $msg = 'Unable to tie hash to db file.'; |
my $msg = 'Unable to tie hash to db file.'; |
return &error_page($r,$msg); |
&Apache::loncommon::simple_error_page($r,'Search Error', |
|
$msg); |
|
return OK; |
} |
} |
} |
} |
## |
## |
Line 361 END
|
Line 367 END
|
my $msg = |
my $msg = |
'Unable to create table in which to store search results. '. |
'Unable to create table in which to store search results. '. |
'The search has been aborted.'; |
'The search has been aborted.'; |
return &error_page($r,$msg); |
&Apache::loncommon::simple_error_page($r,'Search Error', |
|
$msg); |
|
return OK; |
} |
} |
delete($env{'form.launch'}); |
delete($env{'form.launch'}); |
if (! &make_form_data_persistent($r,$persistent_db_file)) { |
if (! &make_form_data_persistent($r,$persistent_db_file)) { |
my $msg= |
my $msg= |
'Unable to properly store search information. '. |
'Unable to properly store search information. '. |
'The search has been aborted.'; |
'The search has been aborted.'; |
return &error_page($r,$msg); |
&Apache::loncommon::simple_error_page($r,'Search Error', |
|
$msg); |
|
return OK; |
} |
} |
## |
## |
## Print out the frames interface |
## Print out the frames interface |
Line 380 END
|
Line 390 END
|
return OK; |
return OK; |
} |
} |
|
|
sub error_page { |
|
my ($r,$msg) = @_; |
|
$r->print(&Apache::loncommon::start_page('Search Error'). |
|
&mt($msg). |
|
&Apache::loncommon::end_page()); |
|
return OK; |
|
} |
|
|
|
# |
# |
# The mechanism used to store values away and retrieve them does not |
# The mechanism used to store values away and retrieve them does not |
# handle the case of missing environment variables being significant. |
# handle the case of missing environment variables being significant. |
Line 551 sub course_search {
|
Line 553 sub course_search {
|
} else { |
} else { |
$url .= '?symb='; |
$url .= '?symb='; |
} |
} |
$url .= &Apache::lonnet::escape($resource->symb()); |
$url .= &escape($resource->symb()); |
my $title = $resource->compTitle(); |
my $title = $resource->compTitle(); |
$r->print('<br /><a href="'.$url.'" target="cat">'. |
$r->print('<br /><a href="'.$url.'" target="cat">'. |
($title?$title:$url).'</a> - '.$disctype.'<br />'); |
($title?$title:$url).'</a> - '.$disctype.'<br />'); |
Line 587 sub checkonthis {
|
Line 589 sub checkonthis {
|
my ($extension)=($url=~/\.(\w+)$/); |
my ($extension)=($url=~/\.(\w+)$/); |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' && |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' && |
($url) && ($fulltext)) { |
($url) && ($fulltext)) { |
$result.=&Apache::lonnet::ssi_body($url.'?symb='.&Apache::lonnet::escape($symb)); |
$result.=&Apache::lonnet::ssi_body($url.'?symb='.&escape($symb)); |
} |
} |
$result=~s/\s+/ /gs; |
$result=~s/\s+/ /gs; |
my $applies = 0; |
my $applies = 0; |
Line 603 sub checkonthis {
|
Line 605 sub checkonthis {
|
$href=&Apache::lonenc::encrypted($href) |
$href=&Apache::lonenc::encrypted($href) |
.'?symb='.&Apache::lonenc::encrypted($symb); |
.'?symb='.&Apache::lonenc::encrypted($symb); |
} else { |
} else { |
$href.='?symb='.&Apache::lonnet::escape($symb); |
$href.='?symb='.&escape($symb); |
} |
} |
$r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url). |
$r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url). |
'</a><br />'); |
'</a><br />'); |
Line 660 sub print_basic_search_form {
|
Line 662 sub print_basic_search_form {
|
my ($r,$closebutton,$hidden_fields) = @_; |
my ($r,$closebutton,$hidden_fields) = @_; |
my $result = ($env{'form.catalogmode'} ne 'groupsearch'); |
my $result = ($env{'form.catalogmode'} ne 'groupsearch'); |
my $bread_crumb = |
my $bread_crumb = |
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Search_Basic', |
&Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic', |
undef,undef, |
$env{'form.catalogmode'} ne 'groupsearch'); |
$env{'form.catalogmode'} ne 'groupsearch'); |
|
my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb; |
my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb; |
if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) { |
if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) { |
# Define interface components |
# Define interface components |
Line 704 sub print_basic_search_form {
|
Line 705 sub print_basic_search_form {
|
} |
} |
$scrout.='<table>'. |
$scrout.='<table>'. |
'<tr><td align="center" valign="top">'. |
'<tr><td align="center" valign="top">'. |
&Apache::lonhtmlcommon::textbox |
&Apache::lonhtmlcommon::textbox('basicexp', |
('basicexp', |
$env{'form.basicexp'},50). |
&HTML::Entities::encode($env{'form.basicexp'},'<>&"'),50 |
|
). |
|
'<br />'. |
'<br />'. |
'<font size="-1">'.&searchhelp().'</font>'.'</td>'. |
'<font size="-1">'.&searchhelp().'</font>'.'</td>'. |
'<td><font size="-1">'. |
'<td><font size="-1">'. |
Line 794 Prints the advanced search form.
|
Line 793 Prints the advanced search form.
|
sub print_advanced_search_form{ |
sub print_advanced_search_form{ |
my ($r,$closebutton,$hidden_fields) = @_; |
my ($r,$closebutton,$hidden_fields) = @_; |
my $bread_crumb = |
my $bread_crumb = |
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching', |
&Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Advanced', |
'Search_Advanced', |
$env{'form.catalogmode'} ne 'groupsearch'); |
undef,undef, |
|
$env{'form.catalogmode'} ne 'groupsearch'); |
|
my %lt=&Apache::lonlocal::texthash('srch' => 'Search', |
my %lt=&Apache::lonlocal::texthash('srch' => 'Search', |
'reset' => 'Reset', |
'reset' => 'Reset', |
'help' => 'Help'); |
'help' => 'Help'); |
Line 1152 sub get_persistent_form_data {
|
Line 1149 sub get_persistent_form_data {
|
# End kludge (hopefully) |
# End kludge (hopefully) |
next if (exists($env{$name})); |
next if (exists($env{$name})); |
my @values = map { |
my @values = map { |
&Apache::lonnet::unescape($_); |
&unescape($_); |
} split(',',$persistent_db{$name}); |
} split(',',$persistent_db{$name}); |
next if (@values <1); |
next if (@values <1); |
if ($arrays_allowed{$name}) { |
if ($arrays_allowed{$name}) { |
Line 1198 sub get_persistent_data {
|
Line 1195 sub get_persistent_data {
|
next; |
next; |
} |
} |
my @values = map { |
my @values = map { |
&Apache::lonnet::unescape($_); |
&unescape($_); |
} split(',',$persistent_db{$name}); |
} split(',',$persistent_db{$name}); |
if (@values <= 1) { |
if (@values <= 1) { |
push @Values,$values[0]; |
push @Values,$values[0]; |
Line 1235 sub make_persistent {
|
Line 1232 sub make_persistent {
|
foreach my $name (keys(%save)) { |
foreach my $name (keys(%save)) { |
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name})); |
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name})); |
# We handle array references, but not recursively. |
# We handle array references, but not recursively. |
my $store = join(',', map { &Apache::lonnet::escape($_); } @values ); |
my $store = join(',', map { &escape($_); } @values ); |
$persistent_db{$name} = $store; |
$persistent_db{$name} = $store; |
} |
} |
untie(%persistent_db); |
untie(%persistent_db); |
Line 1318 sub parse_advanced_search {
|
Line 1315 sub parse_advanced_search {
|
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
next if (! exists($env{'form.'.$_})); |
next if (! exists($env{'form.'.$_})); |
$env{'form.'.$_}=&Apache::lonnet::unescape($env{'form.'.$_}); |
$env{'form.'.$_}=&unescape($env{'form.'.$_}); |
$env{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$env{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
# Preprocess the category form element. |
# Preprocess the category form element. |
Line 1586 sub parse_basic_search {
|
Line 1583 sub parse_basic_search {
|
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
next unless (exists($env{"form.$_"})); |
next unless (exists($env{"form.$_"})); |
$env{"form.$_"}=&Apache::lonnet::unescape($env{"form.$_"}); |
$env{"form.$_"}=&unescape($env{"form.$_"}); |
$env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions(); |
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions(); |
Line 2109 END
|
Line 2106 END
|
my $start_page = &Apache::loncommon::start_page('Results',$js, |
my $start_page = &Apache::loncommon::start_page('Results',$js, |
{'only_body' => 1}); |
{'only_body' => 1}); |
my $breadcrumbs= |
my $breadcrumbs= |
&Apache::lonhtmlcommon::breadcrumbs |
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching', |
(undef,'Searching','Searching',undef,undef, |
$env{'form.catalogmode'} ne 'groupsearch'); |
$env{'form.catalogmode'} ne 'groupsearch'); |
|
|
|
my $result = <<END; |
my $result = <<END; |
$start_page |
$start_page |
Line 2339 sub run_search {
|
Line 2335 sub run_search {
|
# |
# |
my $start_page = &Apache::loncommon::start_page('Search Status',undef, |
my $start_page = &Apache::loncommon::start_page('Search Status',undef, |
{'only_body' => 1}); |
{'only_body' => 1}); |
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs |
my $breadcrumbs = |
(undef,'Searching','Searching',undef,undef, |
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching', |
$env{'form.catalogmode'} ne 'groupsearch'); |
$env{'form.catalogmode'} ne 'groupsearch'); |
$r->print(<<END); |
$r->print(<<END); |
$start_page |
$start_page |
$breadcrumbs |
$breadcrumbs |
Line 2861 sub parse_row {
|
Line 2857 sub parse_row {
|
&set_up_table_structure(); |
&set_up_table_structure(); |
} |
} |
for (my $i=0;$i<=$#Row;$i++) { |
for (my $i=0;$i<=$#Row;$i++) { |
$Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]); |
$Fields{$Datatypes[$i]->{'name'}}=&unescape($Row[$i]); |
} |
} |
$Fields{'language'} = |
$Fields{'language'} = |
&Apache::loncommon::languagedescription($Fields{'language'}); |
&Apache::loncommon::languagedescription($Fields{'language'}); |
Line 2898 sub parse_raw_result {
|
Line 2894 sub parse_raw_result {
|
# conclude from self to others regarding fields |
# conclude from self to others regarding fields |
my %Fields=&LONCAPA::lonmetadata::metadata_col_to_hash |
my %Fields=&LONCAPA::lonmetadata::metadata_col_to_hash |
(map { |
(map { |
&Apache::lonnet::unescape($_); |
&unescape($_); |
} (split(/\,/,$result)) ); |
} (split(/\,/,$result)) ); |
return %Fields; |
return %Fields; |
} |
} |
Line 2936 sub handle_custom_fields {
|
Line 2932 sub handle_custom_fields {
|
if ($result=~/^(custom\=.*)$/) { # grab all custom metadata |
if ($result=~/^(custom\=.*)$/) { # grab all custom metadata |
my $tmp=$result; |
my $tmp=$result; |
$tmp=~s/^custom\=//; |
$tmp=~s/^custom\=//; |
my ($k,$v)=map {&Apache::lonnet::unescape($_); |
my ($k,$v)=map {&unescape($_); |
} split(/\,/,$tmp); |
} split(/\,/,$tmp); |
$customhash{$k}=$v; |
$customhash{$k}=$v; |
} |
} |
Line 3125 sub print_frames_interface {
|
Line 3121 sub print_frames_interface {
|
"&persistent_db_id=".$env{'form.persistent_db_id'}; |
"&persistent_db_id=".$env{'form.persistent_db_id'}; |
my $run_search_link = $basic_link."&phase=run_search"; |
my $run_search_link = $basic_link."&phase=run_search"; |
my $results_link = &results_link(); |
my $results_link = &results_link(); |
my $html = &Apache::lonxml::xmlbegin(); |
my $js = <<JS; |
my $head = &Apache::loncommon::headtag('LON-CAPA Digital Library Search Results'); |
<script type="text/javascript"> |
my $end_head = &Apache::loncommon::endheadtag(); |
|
my $result = <<"ENDFRAMES"; |
|
$html |
|
$head |
|
<script> |
|
var targetwin = opener; |
var targetwin = opener; |
var queue = ''; |
var queue = ''; |
</script> |
</script> |
$end_head |
JS |
<frameset rows="150,*"> |
|
|
my $start_page = |
|
&Apache::loncommon::start_page('LON-CAPA Digital Library Search Results', |
|
$js, |
|
{'frameset' => 1, |
|
'add_entries' => { |
|
'rows' => "150,*",},}); |
|
my $end_page = |
|
&Apache::loncommon::end_page({'frameset' => 1}); |
|
|
|
my $result = <<"ENDFRAMES"; |
|
$start_page |
<frame name="statusframe" src="$run_search_link"> |
<frame name="statusframe" src="$run_search_link"> |
<frame name="resultsframe" src="$results_link"> |
<frame name="resultsframe" src="$results_link"> |
</frameset> |
$end_page |
</html> |
|
ENDFRAMES |
ENDFRAMES |
|
|
$r->print($result); |
$r->print($result); |