version 1.235, 2004/12/17 21:44:19
|
version 1.239, 2005/03/16 22:46:24
|
Line 195 sub handler {
|
Line 195 sub handler {
|
&Apache::lonnet::logthis('lonsearchcat:'. |
&Apache::lonnet::logthis('lonsearchcat:'. |
'Unable to recover data from '. |
'Unable to recover data from '. |
$persistent_db_file); |
$persistent_db_file); |
$r->print(<<END); |
my $html=&Apache::lonxml::xmlbegin(); |
<html> |
$r->print(<<END); |
<head><title>LON-CAPA Search Error</title></head> |
$html |
|
<head> |
|
<title>LON-CAPA Search Error</title></head> |
$bodytag |
$bodytag |
We were unable to retrieve data describing your search. This is a serious |
We were unable to retrieve data describing your search. This is a serious |
error and has been logged. Please alert your LON-CAPA administrator. |
error and has been logged. Please alert your LON-CAPA administrator. |
Line 224 END
|
Line 226 END
|
} else { |
} else { |
# 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. |
$r->print('<html><head></head>'.$bodytag. |
my $html=&Apache::lonxml::xmlbegin(); |
|
$r->print($html.'<head></head>'.$bodytag. |
'Unable to tie hash to db file</body></html>'); |
'Unable to tie hash to db file</body></html>'); |
return OK; |
return OK; |
} |
} |
Line 368 END
|
Line 371 END
|
&Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '. |
&Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '. |
'needed table. lonmysql error:'. |
'needed table. lonmysql error:'. |
$errorstring); |
$errorstring); |
|
my $html=&Apache::lonxml::xmlbegin(); |
$r->print(<<END); |
$r->print(<<END); |
<html><head><title>Search Error</title></head> |
$html |
|
<head> |
|
<title>Search Error</title></head> |
$bodytag |
$bodytag |
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. |
Line 380 END
|
Line 386 END
|
} |
} |
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)) { |
$r->print(<<END); |
my $html=&Apache::lonxml::xmlbegin(); |
<html><head><title>Search Error</title></head> |
$r->print(<<END); |
|
$html |
|
<head> |
|
<title>Search Error</title></head> |
$bodytag |
$bodytag |
Unable to properly store search information. The search has been aborted. |
Unable to properly store search information. The search has been aborted. |
</body> |
</body> |
Line 445 sub hidden_field {
|
Line 454 sub hidden_field {
|
{ # Scope the course search to avoid global variables |
{ # Scope the course search to avoid global variables |
# |
# |
# Variables For course search |
# Variables For course search |
|
my %alreadyseen; |
my %hash; |
my %hash; |
my $totalfound; |
my $totalfound; |
|
|
Line 463 sub course_search {
|
Line 473 sub course_search {
|
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; |
|
undef(%alreadyseen); |
if ($ENV{'form.crsrelated'}) { |
if ($ENV{'form.crsrelated'}) { |
($search_string,@New_Words) = &related_version($ENV{'form.courseexp'}); |
($search_string,@New_Words) = &related_version($ENV{'form.courseexp'}); |
if (@New_Words) { |
if (@New_Words) { |
Line 475 sub course_search {
|
Line 486 sub course_search {
|
my $discuss=$ENV{'form.crsdiscuss'}; |
my $discuss=$ENV{'form.crsdiscuss'}; |
my @allwords=($search_string,@New_Words); |
my @allwords=($search_string,@New_Words); |
$totalfound=0; |
$totalfound=0; |
$r->print('<html><head><title>LON-CAPA Course Search</title></head>'. |
my $html=&Apache::lonxml::xmlbegin(); |
|
$r->print($html.'<head><title>LON-CAPA Course Search</title></head>'. |
$bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />'); |
$bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />'); |
$r->rflush(); |
$r->rflush(); |
# ======================================================= Go through the course |
# ======================================================= Go through the course |
Line 581 sub course_search {
|
Line 593 sub course_search {
|
|
|
sub checkonthis { |
sub checkonthis { |
my ($r,$id,$url,$level,$title,$fulltext,$symb,@allwords)=@_; |
my ($r,$id,$url,$level,$title,$fulltext,$symb,@allwords)=@_; |
|
$alreadyseen{$id}=1; |
|
if (&Apache::loncommon::connection_aborted($r)) { return; } |
$r->rflush(); |
$r->rflush(); |
|
|
my $result=$title.' '; |
my $result=$title.' '; |
Line 622 sub checkonthis {
|
Line 636 sub checkonthis {
|
my $dependencies= |
my $dependencies= |
&Apache::lonnet::metadata($url,'dependencies'); |
&Apache::lonnet::metadata($url,'dependencies'); |
foreach (split(/\,/,$dependencies)) { |
foreach (split(/\,/,$dependencies)) { |
if (($_=~/^\/res\//)) { |
if (($_=~/^\/res\//) && (!$alreadyseen{$id})) { |
&checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords); |
&checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords); |
} |
} |
} |
} |
Line 649 sub untiehash {
|
Line 663 sub untiehash {
|
} # End of course search scoping |
} # End of course search scoping |
|
|
sub search_html_header { |
sub search_html_header { |
|
my $html=&Apache::lonxml::xmlbegin(); |
my $Str = <<ENDHEADER; |
my $Str = <<ENDHEADER; |
<html> |
$html |
<head> |
<head> |
<title>The LearningOnline Network with CAPA</title> |
<title>The LearningOnline Network with CAPA</title> |
</head> |
</head> |
Line 1520 sub parse_advanced_search {
|
Line 1535 sub parse_advanced_search {
|
## |
## |
## Deal with restrictions to given domains |
## Deal with restrictions to given domains |
## |
## |
my ($libraries_to_query,$pretty_domains_string) = |
my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) = |
&parse_domain_restrictions(); |
&parse_domain_restrictions(); |
|
push(@queries,$domain_sql_restriction); |
$pretty_search_string .= $pretty_domains_string."<br />\n"; |
$pretty_search_string .= $pretty_domains_string."<br />\n"; |
# |
# |
if (@queries) { |
if (@queries) { |
Line 1529 sub parse_advanced_search {
|
Line 1545 sub parse_advanced_search {
|
} elsif ($customquery) { |
} elsif ($customquery) { |
$query = ''; |
$query = ''; |
} |
} |
# &Apache::lonnet::logthis('query = '.$/.$query); |
&Apache::lonnet::logthis('advanced query = '.$/.$query); |
return ($query,$customquery,$customshow,$libraries_to_query, |
return ($query,$customquery,$customshow,$libraries_to_query, |
$pretty_search_string); |
$pretty_search_string); |
} |
} |
Line 1550 sub parse_domain_restrictions {
|
Line 1566 sub parse_domain_restrictions {
|
# |
# |
my %domain_hash = (); |
my %domain_hash = (); |
my $pretty_domains_string; |
my $pretty_domains_string; |
|
my $domain_sql_restriction; |
foreach (@allowed_domains) { |
foreach (@allowed_domains) { |
$domain_hash{$_}++; |
$domain_hash{$_}++; |
} |
} |
if ($domain_hash{'any'}) { |
if ($domain_hash{'any'}) { |
$pretty_domains_string = "In all LON-CAPA domains."; |
$pretty_domains_string = "In all LON-CAPA domains."; |
|
$domain_sql_restriction = undef; |
} else { |
} else { |
if (@allowed_domains > 1) { |
if (@allowed_domains > 1) { |
$pretty_domains_string = "In LON-CAPA domains:"; |
$pretty_domains_string = "In LON-CAPA domains:"; |
} else { |
} else { |
$pretty_domains_string = "In LON-CAPA domain "; |
$pretty_domains_string = "In LON-CAPA domain "; |
} |
} |
|
$domain_sql_restriction = |
|
'(domain="'.join('" OR domain="',@allowed_domains).'")'; |
foreach (sort @allowed_domains) { |
foreach (sort @allowed_domains) { |
$pretty_domains_string .= "<b>".$_."</b> "; |
$pretty_domains_string .= "<b>".$_."</b> "; |
} |
} |
Line 1570 sub parse_domain_restrictions {
|
Line 1590 sub parse_domain_restrictions {
|
} |
} |
} |
} |
} |
} |
return ($libraries_to_query,$pretty_domains_string); |
return ($libraries_to_query, |
|
$pretty_domains_string, |
|
$domain_sql_restriction); |
} |
} |
|
|
###################################################################### |
###################################################################### |
Line 1599 sub parse_basic_search {
|
Line 1621 sub parse_basic_search {
|
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"}); |
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"}); |
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
my ($libraries_to_query,$pretty_domains_string) = |
my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) = |
&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 |
Line 1623 sub parse_basic_search {
|
Line 1645 sub parse_basic_search {
|
return; |
return; |
} |
} |
push(@Queries,$SQLQuery); |
push(@Queries,$SQLQuery); |
|
push(@Queries,$domain_sql_restriction); |
#foreach my $q (@Queries) { |
#foreach my $q (@Queries) { |
# &Apache::lonnet::logthis(' '.$q); |
# &Apache::lonnet::logthis(' '.$q); |
#} |
#} |
Line 1633 sub parse_basic_search {
|
Line 1656 sub parse_basic_search {
|
} |
} |
$pretty_search_string .= "<br />\n"; |
$pretty_search_string .= "<br />\n"; |
$pretty_search_string =~ s:^<br /> and ::; |
$pretty_search_string =~ s:^<br /> and ::; |
# &Apache::lonnet::logthis($final_query); |
&Apache::lonnet::logthis('simple search final query = '.$/.$final_query); |
return ($final_query,$pretty_search_string, |
return ($final_query,$pretty_search_string, |
$libraries_to_query); |
$libraries_to_query); |
} |
} |
Line 2107 sub print_sort_form {
|
Line 2130 sub print_sort_form {
|
return; |
return; |
} |
} |
my $result; |
my $result; |
|
my $html=&Apache::lonxml::xmlbegin(); |
$result.=<<END; |
$result.=<<END; |
<html> |
$html |
<head> |
<head> |
<script> |
<script> |
function change_sort() { |
function change_sort() { |
Line 2348 sub run_search {
|
Line 2372 sub run_search {
|
# |
# |
# Print run_search header |
# Print run_search header |
# |
# |
|
my $html=&Apache::lonxml::xmlbegin(); |
$r->print(<<END); |
$r->print(<<END); |
<html> |
$html |
<head><title>Search Status</title></head> |
<head> |
|
<title>Search Status</title></head> |
$bodytag |
$bodytag |
<form name="statusform" action="" method="post"> |
<form name="statusform" action="" method="post"> |
<input type="hidden" name="Queue" value="" /> |
<input type="hidden" name="Queue" value="" /> |
Line 3083 END
|
Line 3109 END
|
###################################################################### |
###################################################################### |
sub search_status_header { |
sub search_status_header { |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
|
my $html=&Apache::lonxml::xmlbegin(); |
return <<ENDSTATUS; |
return <<ENDSTATUS; |
<html><head><title>Search Status</title></head> |
$html |
|
<head> |
|
<title>Search Status</title></head> |
$bodytag |
$bodytag |
<h3>Search Status</h3> |
<h3>Search Status</h3> |
Sending search request to LON-CAPA servers.<br /> |
Sending search request to LON-CAPA servers.<br /> |
Line 3107 sub print_frames_interface {
|
Line 3136 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 $result = <<"ENDFRAMES"; |
my $result = <<"ENDFRAMES"; |
<html> |
$html |
<head> |
<head> |
<script> |
<script> |
var targetwin = opener; |
var targetwin = opener; |
Line 3362 $prefix <img src="$icon" />
|
Line 3392 $prefix <img src="$icon" />
|
<dd><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
<dd><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
target='search_preview'>$values{'url'}</a></dd> |
target='search_preview'>$values{'url'}</a></dd> |
END |
END |
foreach my $field ('title','author','subject','keywords','notes', |
foreach my $field ('title','author','domain','subject','keywords','notes', |
'mimetag','language','creationdate','lastrevisiondate', |
'mimetag','language','creationdate','lastrevisiondate', |
'owner','copyrighttag','hostname','abstract') { |
'owner','copyrighttag','hostname','abstract') { |
$result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n". |
$result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n". |
Line 3403 sub xml_sgml_view {
|
Line 3433 sub xml_sgml_view {
|
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
my $xml = '<LonCapaResource>'."\n"; |
my $xml = '<LonCapaResource>'."\n"; |
# The usual suspects |
# The usual suspects |
foreach my $field ('url','title','author','subject','keywords','notes') { |
foreach my $field ('url','title','author','subject','keywords','notes','domain') { |
$xml .= qq{<$field>$values{$field}</$field>}."\n"; |
$xml .= qq{<$field>$values{$field}</$field>}."\n"; |
} |
} |
# |
# |
Line 3504 sub output_unparsed_phrase_error {
|
Line 3534 sub output_unparsed_phrase_error {
|
my $heading = &mt('Unparsed Field'); |
my $heading = &mt('Unparsed Field'); |
my $revise = &mt('Revise search request'); |
my $revise = &mt('Revise search request'); |
# make query information persistent to allow for subsequent revision |
# make query information persistent to allow for subsequent revision |
|
my $html=&Apache::lonxml::xmlbegin(); |
$r->print(<<ENDPAGE); |
$r->print(<<ENDPAGE); |
<html> |
$html |
<head> |
<head> |
<title>The LearningOnline Network with CAPA</title> |
<title>The LearningOnline Network with CAPA</title> |
</head> |
</head> |
Line 3552 sub output_blank_field_error {
|
Line 3583 sub output_blank_field_error {
|
my $errormsg = &mt('You did not fill in enough information for the search to be started. You need to fill in relevant fields on the search page in order for a query to be processed.'); |
my $errormsg = &mt('You did not fill in enough information for the search to be started. You need to fill in relevant fields on the search page in order for a query to be processed.'); |
my $revise = &mt('Revise Search Request'); |
my $revise = &mt('Revise Search Request'); |
my $heading = &mt('Unactionable Search Queary'); |
my $heading = &mt('Unactionable Search Queary'); |
|
my $html=&Apache::lonxml::xmlbegin(); |
$r->print(<<ENDPAGE); |
$r->print(<<ENDPAGE); |
<html> |
$html |
<head> |
<head> |
<title>The LearningOnline Network with CAPA</title> |
<title>The LearningOnline Network with CAPA</title> |
</head> |
</head> |
Line 3598 sub output_date_error {
|
Line 3630 sub output_date_error {
|
my ($r,$message,$closebutton,$hidden_fields)=@_; |
my ($r,$message,$closebutton,$hidden_fields)=@_; |
# make query information persistent to allow for subsequent revision |
# make query information persistent to allow for subsequent revision |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
|
my $html=&Apache::lonxml::xmlbegin(); |
$r->print(<<RESULTS); |
$r->print(<<RESULTS); |
<html> |
$html |
<head> |
<head> |
<title>The LearningOnline Network with CAPA</title> |
<title>The LearningOnline Network with CAPA</title> |
</head> |
</head> |