version 1.216, 2004/04/23 17:52:55
|
version 1.221, 2004/05/04 15:20:17
|
Line 117 sub handler {
|
Line 117 sub handler {
|
|
|
my $loaderror=&Apache::lonnet::overloaderror($r); |
my $loaderror=&Apache::lonnet::overloaderror($r); |
if ($loaderror) { return $loaderror; } |
if ($loaderror) { return $loaderror; } |
|
# |
my $closebutton; # button that closes the search window |
my $closebutton; # button that closes the search window |
# This button is different for the RAT compared to |
# This button is different for the RAT compared to |
# normal invocation. |
# normal invocation. |
Line 185 sub handler {
|
Line 185 sub handler {
|
bug=>'Searching',}); |
bug=>'Searching',}); |
} |
} |
# |
# |
if (! &get_persistent_form_data($persistent_db_file)) { |
if ($ENV{'form.phase'} !~ m/(basic|adv|course)_search/) { |
if ($ENV{'form.phase'} =~ /(run_search|results)/) { |
if (! &get_persistent_form_data($persistent_db_file)) { |
&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ". |
if ($ENV{'form.phase'} =~ /(run_search|results)/) { |
"from $persistent_db_file"); |
&Apache::lonnet::logthis('lonsearchcat:'. |
$r->print(<<END); |
'Unable to recover data from '. |
|
$persistent_db_file); |
|
$r->print(<<END); |
<html> |
<html> |
<head><title>LON-CAPA Search Error</title></head> |
<head><title>LON-CAPA Search Error</title></head> |
$bodytag |
$bodytag |
Line 198 error and has been logged. Please alert
|
Line 200 error and has been logged. Please alert
|
</body> |
</body> |
</html> |
</html> |
END |
END |
return OK; |
return OK; |
|
} |
} |
} |
|
} else { |
|
&clean_up_environment(); |
} |
} |
## |
## |
## Clear out old values from groupsearch database |
## Clear out old values from groupsearch database |
Line 286 END
|
Line 291 END
|
$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'})); |
$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'})); |
$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'})); |
$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'})); |
# |
# |
$ENV{'form.searchmode'} = 'basic'; |
$ENV{'form.searchmode'} = 'basic' if (! exists($ENV{'form.searchmode'})); |
if ($ENV{'form.phase'} eq 'adv_search' || |
if ($ENV{'form.phase'} eq 'adv_search' || |
$ENV{'form.phase'} eq 'disp_adv') { |
$ENV{'form.phase'} eq 'disp_adv') { |
$ENV{'form.searchmode'} = 'advanced'; |
$ENV{'form.searchmode'} = 'advanced'; |
Line 389 END
|
Line 394 END
|
return OK; |
return OK; |
} |
} |
|
|
|
# |
|
# The mechanism used to store values away and retrieve them does not |
|
# handle the case of missing environment variables being significant. |
|
# |
|
# This routine sets non existant checkbox form elements to ''. |
|
# |
|
sub clean_up_environment { |
|
if ($ENV{'form.phase'} eq 'basic_search') { |
|
if (! exists($ENV{'form.related'})) { |
|
$ENV{'form.related'} = ''; |
|
} |
|
if (! exists($ENV{'form.domains'})) { |
|
$ENV{'form.domains'} = ''; |
|
} |
|
} elsif ($ENV{'form.phase'} eq 'adv_search') { |
|
foreach my $field ('title','keywords','notes', |
|
'abstract','standards','mime') { |
|
if (! exists($ENV{'form.'.$field.'_related'})) { |
|
$ENV{'form.'.$field.'_related'} = ''; |
|
} |
|
} |
|
} elsif ($ENV{'form.phase'} eq 'course_search') { |
|
if (! exists($ENV{'form.crsrelated'})) { |
|
$ENV{'form.crsrelated'} = ''; |
|
} |
|
} |
|
} |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
## |
## |
Line 405 my $totalfound;
|
Line 438 my $totalfound;
|
|
|
sub course_search { |
sub course_search { |
my $r=shift; |
my $r=shift; |
my $bodytag=&Apache::loncommon::bodytag('Course Search'). |
my $bodytag=&Apache::loncommon::bodytag('Course Search'); |
&Apache::loncommon::help_open_bug('Searching'); |
|
my $pretty_search_string = '<b>'.$ENV{'form.courseexp'}.'</b>'; |
my $pretty_search_string = '<b>'.$ENV{'form.courseexp'}.'</b>'; |
my $search_string = $ENV{'form.courseexp'}; |
my $search_string = $ENV{'form.courseexp'}; |
my @New_Words; |
my @New_Words; |
Line 504 sub search_html_header {
|
Line 536 sub search_html_header {
|
<html> |
<html> |
<head> |
<head> |
<title>The LearningOnline Network with CAPA</title> |
<title>The LearningOnline Network with CAPA</title> |
<script type="text/javascript"> |
|
function openhelp(val) { |
|
openhelpwin=open('/adm/help/searchcat.html','helpscreen', |
|
'scrollbars=1,width=600,height=300'); |
|
openhelpwin.focus(); |
|
} |
|
</script> |
|
</head> |
</head> |
ENDHEADER |
ENDHEADER |
return $Str; |
return $Str; |
Line 532 Prints the form for the basic search. S
|
Line 557 Prints the form for the basic search. S
|
sub print_basic_search_form { |
sub print_basic_search_form { |
my ($r,$closebutton,$hidden_fields) = @_; |
my ($r,$closebutton,$hidden_fields) = @_; |
my $bodytag=&Apache::loncommon::bodytag('Search'). |
my $bodytag=&Apache::loncommon::bodytag('Search'). |
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Finding_Resources', |
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Searching', |
undef,undef,! $ENV{'form.launch'}); |
undef,undef,! $ENV{'form.launch'}); |
my $scrout = &search_html_header().$bodytag; |
my $scrout = &search_html_header().$bodytag; |
if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) { |
if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) { |
Line 540 sub print_basic_search_form {
|
Line 565 sub print_basic_search_form {
|
my $userelatedwords= |
my $userelatedwords= |
&mt('[_1] use related words', |
&mt('[_1] use related words', |
&Apache::lonhtmlcommon::checkbox |
&Apache::lonhtmlcommon::checkbox |
('related',$ENV{'form.related'})); |
('related',$ENV{'form.related'},'related')); |
my $onlysearchdomain= |
my $onlysearchdomain= |
&mt('[_1] only search domain [_2]', |
&mt('[_1] only search domain [_2]', |
&Apache::lonhtmlcommon::checkbox |
&Apache::lonhtmlcommon::checkbox('domains', |
('domains',$ENV{'form.domains'}), |
$ENV{'form.domains'}, |
$r->dir_config('lonDefDomain')); |
$r->dir_config('lonDefDomain') |
|
), |
|
$r->dir_config('lonDefDomain') |
|
); |
my $adv_search_link = |
my $adv_search_link = |
'<a href="/adm/searchcat?'. |
'<a href="/adm/searchcat?'. |
'phase=disp_adv&'. |
'phase=disp_adv&'. |
Line 656 Prints the advanced search form.
|
Line 684 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 $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search'). |
|
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching', |
|
'Searching', |
|
undef,undef, |
|
! $ENV{'form.launch'}); |
|
|
my %lt=&Apache::lonlocal::texthash('srch' => 'Search', |
my %lt=&Apache::lonlocal::texthash('srch' => 'Search', |
'reset' => 'Reset', |
'reset' => 'Reset', |
'help' => 'Help'); |
'help' => 'Help'); |
my $advanced_buttons = <<"END"; |
my $advanced_buttons=<<"END"; |
<p> |
|
<input type="submit" name="advancedsubmit" value='$lt{"srch"}' /> |
<input type="submit" name="advancedsubmit" value='$lt{"srch"}' /> |
<input type="reset" name="reset" value='$lt{"reset"}' /> |
<input type="reset" name="reset" value='$lt{"reset"}' /> |
$closebutton |
$closebutton |
<input type="button" value="$lt{'help'}" onClick="openhelp()" /> |
|
END |
END |
my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search'). |
|
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching', |
|
'Finding_Resources', |
|
undef,undef, |
|
! $ENV{'form.launch'}); |
|
my $searchhelp=&searchhelp(); |
|
my $scrout=&search_html_header(); |
my $scrout=&search_html_header(); |
$scrout .= <<"ENDHEADER"; |
$scrout .= <<"ENDHEADER"; |
$bodytag |
$bodytag |
<form method="post" action="/adm/searchcat" name="advsearch"> |
<form method="post" action="/adm/searchcat" name="advsearch"> |
|
<p> |
$advanced_buttons |
$advanced_buttons |
ENDHEADER |
ENDHEADER |
$scrout.=(' 'x2).&viewoptions().'</p>'.$hidden_fields. |
$scrout.=(' 'x2).&viewoptions().'</p>'.$hidden_fields. |
'<input type="hidden" name="phase" value="adv_search" />'; |
'<input type="hidden" name="phase" value="adv_search" />'; |
my %fields=&Apache::lonmeta::fieldnames(); |
my %fields=&Apache::lonmeta::fieldnames(); |
# |
# |
$scrout.= '<p>'.$searchhelp.'</p>'. |
$scrout .= '<h3>'.&mt('Standard Metadata').'</h3>'; |
"<table>\n"; |
$scrout .= "<table>\n"; |
|
$scrout .= '<tr><td> </td><td colspan="2"><font size="-1">'. |
|
(' 'x2).&searchhelp()."</font></td></tr>\n"; |
my %related_word_search = |
my %related_word_search = |
('title'=>1, |
('title' => 1, |
'author'=>0, |
'author' => 0, |
'owner'=>0, |
'owner' => 0, |
'authorspace'=>0, |
'authorspace' => 0, |
'modifyinguser'=>0, |
'modifyinguser'=> 0, |
'keywords'=>1, |
'keywords' => 1, |
'notes'=>1, |
'notes' => 1, |
'abstract'=>1, |
'abstract' => 1, |
'standards'=>1, |
'standards'=> 1, |
'mime'=>1, |
'mime' => 1, |
); |
); |
# |
# |
foreach my $field ('title','author','owner','authorspace','modifyinguser', |
foreach my $field ('title','author','owner','authorspace','modifyinguser', |
Line 736 ENDHEADER
|
Line 765 ENDHEADER
|
&Apache::loncommon::domain_select('domains', |
&Apache::loncommon::domain_select('domains', |
$ENV{'form.domains'},1). |
$ENV{'form.domains'},1). |
'</td></tr>'.$/; |
'</td></tr>'.$/; |
$scrout .= "</table>\n<br />"; |
# |
|
# Misc metadata |
|
$scrout.='<tr><td align="right" valign="top">'. |
|
&titlefield(&mt('Copyright/Distribution')).'</td><td colspan="2">'. |
|
&Apache::lonmeta::selectbox('copyright', |
|
'',, |
|
\&Apache::loncommon::copyrightdescription, |
|
( undef, |
|
&Apache::loncommon::copyrightids) |
|
).'</td></tr>'.$/; |
|
$scrout.='<tr><td align="right" valign="top">'. |
|
&titlefield(&mt('Language')).'</td><td colspan="2">'. |
|
&Apache::lonmeta::selectbox('language', |
|
'notset',, |
|
\&Apache::loncommon::languagedescription, |
|
('any',&Apache::loncommon::languageids) |
|
).'</td></tr>'; |
|
$scrout .= "</table>\n"; |
|
# |
|
# Dynamic metadata |
|
$scrout .= '<h3>'.&mt('Problem Statistics').'</h3>'; |
|
$scrout .= "<table>\n"; |
|
$scrout .= '<tr><td> </td><td align="center">'.&mt('Minimum').'</td>'. |
|
'<td align="center">'.&mt('Maximum').'</td></tr>'."\n"; |
|
foreach my $statistic |
|
({ name=>'stdno', |
|
description=>'Number of Students',}, |
|
{ name => 'avetries', |
|
description=>'Average tries to answer correctly',}, |
|
{ name => 'difficulty', |
|
description=>'Degree of difficulty',}, |
|
{ name => 'disc', |
|
description=>'Degree of discrimination'}) { |
|
$scrout .= '<tr><td align="right">'. |
|
&titlefield(&mt($statistic->{'description'})). |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$statistic->{'name'}.'_min" '. |
|
'value="" size="6" />'. |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$statistic->{'name'}.'_max" '. |
|
'value="" size="6" />'. |
|
'</td></tr>'.$/; |
|
} |
|
$scrout .= "</table>\n"; |
|
$scrout .= '<h3>'.&mt('Evaluation Data').'</h3>'; |
|
$scrout .= "<table>\n"; |
|
$scrout .= '<tr><td> </td><td align="center">'.&mt('Minimum').'</td>'. |
|
'<td align="center">'.&mt('Maximum').'</td></tr>'."\n"; |
|
foreach my $evaluation |
|
( { name => 'clear', |
|
description => 'Material presented in clear way'}, |
|
{ name =>'depth', |
|
description => 'Material covered with sufficient depth'}, |
|
{ name => 'helpful', |
|
description => 'Material is helpful'}, |
|
{ name => 'correct', |
|
description => 'Material appears to be correct'}, |
|
{ name => 'technical', |
|
description => 'Resource is technically correct'}){ |
|
$scrout .= '<tr><td align="right">'. |
|
&titlefield(&mt($evaluation->{'description'})). |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$evaluation->{'name'}.'_min" '. |
|
'value="" size="6" />'. |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$evaluation->{'name'}.'_max" '. |
|
'value="" size="6" />'. |
|
'</td></tr>'.$/; |
|
} |
|
$scrout .= "</table>\n"; |
# |
# |
# Creation/Modification date limits |
# Creation/Modification date limits |
|
$scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>'; |
$scrout .= "\n<table>\n"; |
$scrout .= "\n<table>\n"; |
my $cafter = |
my $cafter = |
&Apache::lonhtmlcommon::date_setter('advsearch', # formname |
&Apache::lonhtmlcommon::date_setter('advsearch', # formname |
Line 1082 Parse advanced search form and return th
|
Line 1181 Parse advanced search form and return th
|
sub parse_advanced_search { |
sub parse_advanced_search { |
my ($r,$closebutton,$hidden_fields)=@_; |
my ($r,$closebutton,$hidden_fields)=@_; |
my @BasicFields = ('title','author','subject','keywords','url','version', |
my @BasicFields = ('title','author','subject','keywords','url','version', |
'notes','abstract','extension','language','owner', |
'notes','abstract','extension','owner', |
# 'custommetadata','customshow', |
# 'custommetadata','customshow', |
'modifyinguser','standards','mime'); |
'modifyinguser','standards','mime'); |
|
my @StatsFields = ('stdno','avetries','difficulty','disc'); |
|
my @EvalFields = ('clear','depth','helpful','correct','technical'); |
my $fillflag=0; |
my $fillflag=0; |
my $pretty_search_string = "<br />\n"; |
my $pretty_search_string = "<br />\n"; |
# Clean up fields for safety |
# Clean up fields for safety |
Line 1097 sub parse_advanced_search {
|
Line 1197 sub parse_advanced_search {
|
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondateend_day','lastrevisiondateend_year') { |
'lastrevisiondateend_day','lastrevisiondateend_year') { |
$ENV{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$ENV{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
|
$ENV{'form.'.$field}=~s/(not\s*$|^\s*(and|or)|)//gi; |
} |
} |
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
Line 1198 sub parse_advanced_search {
|
Line 1299 sub parse_advanced_search {
|
"<br \>\n"; |
"<br \>\n"; |
} |
} |
# |
# |
|
# Statistics |
|
foreach my $field (@StatsFields,@EvalFields) { |
|
my ($min,$max); |
|
if (exists($ENV{'form.'.$field.'_min'}) && |
|
$ENV{'form.'.$field.'_min'} ne '') { |
|
$min = $ENV{'form.'.$field.'_min'}; |
|
} |
|
if (exists($ENV{'form.'.$field.'_max'}) && |
|
$ENV{'form.'.$field.'_max'} ne '') { |
|
$max = $ENV{'form.'.$field.'_max'}; |
|
} |
|
next if (! defined($max) && ! defined($min)); |
|
if (defined($min) && defined($max)) { |
|
($min,$max) = sort {$a <=>$b} ($min,$max); |
|
} |
|
if (defined($min) && $min =~ /^(\d+\.\d+|\d+|\.\d+)$/) { |
|
push(@queries,'('.$field.'>'.$min.')'); |
|
$pretty_search_string.=$font.$field.'</font>>'.$min.'<br />'; |
|
} |
|
if (defined($max) && $max =~ /^(\d+\.\d+|\d+|\.\d+)$/) { |
|
push(@queries,'('.$field.'<'.$max.')'); |
|
$pretty_search_string.=$font.$field.'</font><'.$max.'<br />'; |
|
} |
|
} |
|
# |
# Evaluate date windows |
# Evaluate date windows |
my $cafter = |
my $cafter = |
&Apache::lonhtmlcommon::get_date_from_form('creationdate1'); |
&Apache::lonhtmlcommon::get_date_from_form('creationdate1'); |
Line 1262 sub parse_advanced_search {
|
Line 1388 sub parse_advanced_search {
|
} elsif ($customquery) { |
} elsif ($customquery) { |
$query = ''; |
$query = ''; |
} |
} |
|
# &Apache::lonnet::logthis('query = '.$/.$query); |
return ($query,$customquery,$customshow,$libraries_to_query, |
return ($query,$customquery,$customshow,$libraries_to_query, |
$pretty_search_string); |
$pretty_search_string); |
} |
} |
Line 1270 sub parse_domain_restrictions {
|
Line 1397 sub parse_domain_restrictions {
|
my $libraries_to_query = undef; |
my $libraries_to_query = undef; |
# $ENV{'form.domains'} can be either a scalar or an array reference. |
# $ENV{'form.domains'} can be either a scalar or an array reference. |
# We need an array. |
# We need an array. |
if (! exists($ENV{'form.domains'})) { |
if (! exists($ENV{'form.domains'}) || $ENV{'form.domains'} eq '') { |
return (undef,''); |
return (undef,''); |
} |
} |
my @allowed_domains; |
my @allowed_domains; |
Line 1335 sub parse_basic_search {
|
Line 1462 sub parse_basic_search {
|
&parse_domain_restrictions(); |
&parse_domain_restrictions(); |
# |
# |
# Check to see if enough of a query is filled in |
# Check to see if enough of a query is filled in |
unless (&filled($ENV{'form.basicexp'})) { |
my $search_string = $ENV{'form.basicexp'}; |
|
$search_string =~ s/(not\s*$|^\s*(and|or)|)//gi; |
|
if (! &filled($search_string)) { |
&output_blank_field_error($r,$closebutton,'phase=disp_basic'); |
&output_blank_field_error($r,$closebutton,'phase=disp_basic'); |
return OK; |
return OK; |
} |
} |
my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>'; |
my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>'; |
my $search_string = $ENV{'form.basicexp'}; |
|
if ($ENV{'form.related'}) { |
if ($ENV{'form.related'}) { |
my @New_Words; |
my @New_Words; |
($search_string,@New_Words) = &related_version($ENV{'form.basicexp'}); |
($search_string,@New_Words) = &related_version($ENV{'form.basicexp'}); |
Line 2692 extra custom metadata to show.
|
Line 2820 extra custom metadata to show.
|
###################################################################### |
###################################################################### |
sub detailed_citation_view { |
sub detailed_citation_view { |
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
my $icon=&Apache::loncommon::icon($values{'url'}); |
my $icon= |
my $result=<<END; |
my $result; |
<b>$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
$result .= '<b>'.$prefix. |
target='search_preview'>$values{'title'}</a></b> |
'<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'. |
<p> |
'<a href="http://'.$ENV{'HTTP_HOST'}.$values{'url'}.'" '. |
<b>$values{'author'}</b>, <i>$values{'owner'}</i><br /> |
'target="search_preview">'.$values{'title'}."</a></b>\n"; |
|
$result .= "<p>\n"; |
<b>Subject: </b> $values{'subject'}<br /> |
$result .= '<b>'.$values{'author'}.'</b>,'. |
<b>Keyword(s): </b> $values{'keywords'}<br /> |
' <i>'.$values{'owner'}.'</i><br />'; |
<b>Notes: </b> $values{'notes'}<br /> |
foreach my $field |
<b>MIME Type: </b> $values{'mimetag'}<br /> |
( |
<b>Language: </b> $values{'language'}<br /> |
{ name=>'subject', |
<b>Copyright/Distribution:</b> $values{'copyrighttag'}<br /> |
translate => '<b>Subject:</b> [_1]',}, |
</p> |
{ name=>'keywords', |
$values{'extrashow'} |
translate => '<b>Keywords:</b> [_1]',}, |
<p> |
{ name=>'notes', |
$values{'shortabstract'} |
translate => '<b>Notes:</b> [_1]',}, |
</p> |
{ name=>'mimetag', |
<hr align='left' width='200' noshade /> |
translate => '<b>MIME Type:</b> [_1]',}, |
END |
{ name=>'standards', |
|
translate => '<b>Standards:</b>[_1]',}, |
|
{ name=>'copyrighttag', |
|
translate => '<b>Copyright/Distribution:</b> [_1]',}, |
|
{ name=>'stdno', |
|
translate => '<b>Number of Students:</b> [_1]',}, |
|
{ name=>'avetries', |
|
translate => '<b>Average Tries:</b> [_1]',}, |
|
{ name=>'disc', |
|
translate => '<b>Degree of Discrimination:</b> [_1]',}, |
|
{ name=>'difficulty', |
|
translate => '<b>Degree of Difficulty:</b> [_1]',}, |
|
{ name=>'clear', |
|
translate => '<b>Clear:</b> [_1]',}, |
|
{ name=>'depth', |
|
translate => '<b>Depth:</b> [_1]',}, |
|
{ name=>'helpful', |
|
translate => '<b>Helpful:</b> [_1]',}, |
|
{ name=>'correct', |
|
translate => '<b>Correcy:</b> [_1]',}, |
|
{ name=>'technical', |
|
translate => '<b>Technical:</b> [_1]',}, |
|
) { |
|
$result.= &mt($field->{'translate'},$values{$field->{'name'}}). |
|
"<br />\n"; |
|
} |
|
$result .= "</p>".$values{'extrashow'}. |
|
'<p>'.$values{'shortabstract'}.'</p>'; |
|
$result .= '<hr align="left" width="200" noshade />'."\n"; |
return $result; |
return $result; |
} |
} |
|
|