version 1.147, 2002/07/30 18:30:56
|
version 1.151, 2002/08/04 18:28:01
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# YEAR=2001 |
|
# 3/8, 3/12, 3/13, 3/14, 3/15, 3/19 Scott Harrison |
|
# 3/20, 3/21, 3/22, 3/26, 3/27, 4/2, 8/15, 8/24, 8/25 Scott Harrison |
|
# 10/12,10/14,10/15,10/16,11/28,11/29,12/10,12/12,12/16 Scott Harrison |
|
# YEAR=2002 |
|
# 1/17 Scott Harrison |
|
# 6/17 Matthew Hall |
|
# |
|
############################################################################### |
############################################################################### |
############################################################################### |
############################################################################### |
|
|
Line 140 my $diropendb = ""; # db file
|
Line 132 my $diropendb = ""; # db file
|
my %Views = ("Detailed Citation View" => \&detailed_citation_view, |
my %Views = ("Detailed Citation View" => \&detailed_citation_view, |
"Summary View" => \&summary_view, |
"Summary View" => \&summary_view, |
"Fielded Format" => \&fielded_format_view, |
"Fielded Format" => \&fielded_format_view, |
"XML/SGML" => \&xml_sgml_view ); |
"XML/SGML" => \&xml_sgml_view, |
|
"Compact View" => \&compact_view); |
my %persistent_db; |
my %persistent_db; |
my $hidden_fields; |
my $hidden_fields; |
###################################################################### |
###################################################################### |
Line 214 sub handler {
|
Line 207 sub handler {
|
'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db'; |
'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db'; |
## |
## |
if (! &get_persistent_form_data($r,$persistent_db_file)) { |
if (! &get_persistent_form_data($r,$persistent_db_file)) { |
&write_status($r,"Unable to get persistent data"); |
if ($ENV{'form.phase'} =~ /(run_search|results)/) { |
|
&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ". |
|
"from $persistent_db_file"); |
|
$r->print(<<END); |
|
<html> |
|
<head><title>LON-CAPA Search Error</title></head> |
|
<body> |
|
We were unable to retrieve data describing your search. This is a serious |
|
error and has been logged. Please alert your LON-CAPA administrator. |
|
</body> |
|
</html> |
|
END |
|
return OK; |
|
} |
} |
} |
## |
## |
## Clear out old values from groupsearch database |
## Clear out old values from groupsearch database |
## |
## |
untie %groupsearch_db if (tied(%groupsearch_db)); |
untie %groupsearch_db if (tied(%groupsearch_db)); |
if ($ENV{'form.launch'} eq '1') { |
if ($ENV{'form.launch'} eq '1' && |
if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) { |
($ENV{'form.catalogmode'} eq 'groupsearch') && |
|
($ENV{'form.phase'} eq 'results')) { |
|
if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { |
&start_fresh_session(); |
&start_fresh_session(); |
untie %groupsearch_db; |
untie %groupsearch_db; |
} else { |
} else { |
Line 231 sub handler {
|
Line 239 sub handler {
|
} |
} |
} |
} |
## |
## |
## Configure dynamic components of interface |
## Configure hidden fields |
## |
## |
$hidden_fields = '<input type="hidden" name="persistent_db_id" value="'. |
$hidden_fields = '<input type="hidden" name="persistent_db_id" value="'. |
$ENV{'form.persistent_db_id'}.'" />'; |
$ENV{'form.persistent_db_id'}.'" />'."\n"; |
|
if (exists($ENV{'form.catalogmode'})) { |
|
$hidden_fields .= '<input type="hidden" name="catalogmode" value="'. |
|
$ENV{'form.catalogmode'}.'" />'."\n"; |
|
} |
|
if (exists($ENV{'form.form'})) { |
|
$hidden_fields .= '<input type="hidden" name="form" value="'. |
|
$ENV{'form.form'}.'" />'."\n"; |
|
} |
|
if (exists($ENV{'form.element'})) { |
|
$hidden_fields .= '<input type="hidden" name="element" value="'. |
|
$ENV{'form.element'}.'" />'."\n"; |
|
} |
|
if (exists($ENV{'form.mode'})) { |
|
$hidden_fields .= '<input type="hidden" name="mode" value="'. |
|
$ENV{'form.mode'}.'" />'."\n"; |
|
} |
|
## |
|
## Configure dynamic components of interface |
## |
## |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
$closebutton="<input type='button' name='close' value='CLOSE' ". |
$closebutton="<input type='button' name='close' value='CLOSE' "; |
"onClick='self.close()'>"."\n"; |
if ($ENV{'form.phase'} =~ /(results|run_search)/) { |
|
$closebutton .="onClick='parent.close()'"; |
|
} else { |
|
$closebutton .="onClick='self.close()'"; |
|
} |
|
$closebutton .=">\n"; |
} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') { |
} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') { |
$closebutton=<<END; |
$closebutton="<input type='button' name='close' value='CLOSE' "; |
<input type='button' name='close' value='CLOSE' onClick='self.close()'> |
if ($ENV{'form.phase'} =~ /(results|run_search)/) { |
END |
$closebutton .="onClick='parent.close()'"; |
|
} else { |
|
$closebutton .="onClick='self.close()'"; |
|
} |
|
$closebutton .= ">"; |
$importbutton=<<END; |
$importbutton=<<END; |
<input type='button' name='import' value='IMPORT' |
<input type='button' name='import' value='IMPORT' |
onClick='javascript:select_group()'> |
onClick='javascript:select_group()'> |
Line 255 END
|
Line 290 END
|
## Sanity checks on form elements |
## Sanity checks on form elements |
## |
## |
if (!defined($ENV{'form.viewselect'})) { |
if (!defined($ENV{'form.viewselect'})) { |
$ENV{'form.viewselect'} ="Detailed Citation View"; |
if (($ENV{'form.catalogmode'} eq 'groupsearch') || |
|
($ENV{'form.catalogmode'} eq 'interactive')) { |
|
$ENV{'form.viewselect'} ="Compact View"; |
|
} else { |
|
$ENV{'form.viewselect'} ="Detailed Citation View"; |
|
} |
} |
} |
$ENV{'form.phase'} = 'displaybasic' if (! exists($ENV{'form.phase'})); |
$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'})); |
|
$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'})); |
## |
## |
## Switch on the phase |
## Switch on the phase |
## |
## |
Line 267 END
|
Line 308 END
|
&print_advanced_search_form($r,$closebutton); |
&print_advanced_search_form($r,$closebutton); |
} elsif ($ENV{'form.phase'} eq 'results') { |
} elsif ($ENV{'form.phase'} eq 'results') { |
&display_results($r,$importbutton,$closebutton); |
&display_results($r,$importbutton,$closebutton); |
} elsif($ENV{'form.phase'} eq 'run_search') { |
} elsif ($ENV{'form.phase'} =~ /^(sort|run_search)$/) { |
my ($query,$customquery,$customshow,$libraries,$pretty_string) = |
my ($query,$customquery,$customshow,$libraries,$pretty_string) = |
&get_persistent_data($persistent_db_file, |
&get_persistent_data($persistent_db_file, |
['query','customquery','customshow', |
['query','customquery','customshow', |
'libraries','pretty_string']); |
'libraries','pretty_string']); |
&write_status($r,"query = $query"); |
if ($ENV{'form.phase'} eq 'sort') { |
&write_status($r,"customquery = $customquery"); |
&print_sort_form($r,$pretty_string); |
&write_status($r,"customshow = $customshow"); |
} elsif ($ENV{'form.phase'} eq 'run_search') { |
&write_status($r,"libraries = $libraries"); |
&run_search($r,$query,$customquery,$customshow, |
&write_status($r,"pretty_string = $pretty_string"); |
$libraries,$pretty_string); |
&run_search($r,$query,$customquery,$customshow, |
} |
$libraries,$pretty_string); |
|
} elsif(($ENV{'form.phase'} eq 'basic_search') || |
} elsif(($ENV{'form.phase'} eq 'basic_search') || |
($ENV{'form.phase'} eq 'adv_search')) { |
($ENV{'form.phase'} eq 'adv_search')) { |
|
$ENV{'form.searchmode'} = 'basic'; |
|
if ($ENV{'form.phase'} eq 'adv_search') { |
|
$ENV{'form.searchmode'} = 'advanced'; |
|
} |
# Set up table |
# Set up table |
if (! defined(&create_results_table())) { |
if (! defined(&create_results_table())) { |
my $error = &Apache::lonmysql::get_error(); |
|
$r->print(<<END); |
$r->print(<<END); |
<html><head><title>Search Error</title></head> |
<html><head><title>Search Error</title></head> |
<body> |
<body> |
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. |
<pre> |
|
ERROR: |
|
$error |
|
</pre> |
|
</body> |
</body> |
</html> |
</html> |
END |
END |
Line 381 then press SEARCH below.
|
Line 420 then press SEARCH below.
|
ENDDOCUMENT |
ENDDOCUMENT |
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40). |
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40). |
' '; |
' '; |
# $scrout.=&simplecheckbox('allversions',$ENV{'form.allversions'}); |
|
# $scrout.='<font color="#800000">Search historic archives</font>'; |
|
my $checkbox = &simplecheckbox('related',$ENV{'form.related'}); |
my $checkbox = &simplecheckbox('related',$ENV{'form.related'}); |
$scrout.=<<END; |
$scrout.=<<END; |
</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr> |
</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr> |
Line 397 END
|
Line 434 END
|
$ENV{'form.viewselect'}, |
$ENV{'form.viewselect'}, |
undef,undef,undef, |
undef,undef,undef, |
sort(keys(%Views))); |
sort(keys(%Views))); |
|
$scrout.=&selectbox(undef,'show', |
|
$ENV{'form.show'}, |
|
undef,undef,undef, |
|
(10,20,50,100)); |
$scrout.=<<ENDDOCUMENT; |
$scrout.=<<ENDDOCUMENT; |
<input type="button" value="HELP" onClick="openhelp()" /> |
per page. |
</p> |
</p> |
</form> |
</form> |
</body> |
</body> |
Line 464 ENDHEADER
|
Line 505 ENDHEADER
|
$ENV{'form.viewselect'}, |
$ENV{'form.viewselect'}, |
undef,undef,undef, |
undef,undef,undef, |
sort(keys(%Views))); |
sort(keys(%Views))); |
|
$scrout.=' '; |
|
$scrout.=&selectbox(undef,'show', |
|
$ENV{'form.show'}, |
|
undef,undef,undef, |
|
(10,20,50,100)); |
|
$scrout.=' '. |
|
'<font color="#800000" face="helvetica">Per Page</font>'; |
$scrout.="</td><td>Related<br />Words</td></tr>\n"; |
$scrout.="</td><td>Related<br />Words</td></tr>\n"; |
$scrout.=&searchphrasefield_with_related('title', 'title' , |
$scrout.=&searchphrasefield_with_related('title', 'title' , |
$ENV{'form.title'}); |
$ENV{'form.title'}); |
Line 627 sub get_persistent_form_data {
|
Line 675 sub get_persistent_form_data {
|
my $filename = shift; |
my $filename = shift; |
return 0 if (! -e $filename); |
return 0 if (! -e $filename); |
return undef if (! tie(%persistent_db,'GDBM_File',$filename, |
return undef if (! tie(%persistent_db,'GDBM_File',$filename, |
&GDBM_READER,0640)); |
&GDBM_READER(),0640)); |
# |
# |
# These make sure we do not get array references printed out as 'values'. |
# These make sure we do not get array references printed out as 'values'. |
my %arrays_allowed = ('form.category'=>1,'form.domains'=>1); |
my %arrays_allowed = ('form.category'=>1,'form.domains'=>1); |
Line 684 sub get_persistent_data {
|
Line 732 sub get_persistent_data {
|
my @Values; # Return array |
my @Values; # Return array |
return undef if (! -e $filename); |
return undef if (! -e $filename); |
return undef if (! tie(%persistent_db,'GDBM_File',$filename, |
return undef if (! tie(%persistent_db,'GDBM_File',$filename, |
&GDBM_READER,0640)); |
&GDBM_READER(),0640)); |
foreach my $name (@Vars) { |
foreach my $name (@Vars) { |
if (! exists($persistent_db{$name})) { |
if (! exists($persistent_db{$name})) { |
push @Values, undef; |
push @Values, undef; |
Line 725 sub make_persistent {
|
Line 773 sub make_persistent {
|
my %save = %{shift()}; |
my %save = %{shift()}; |
my $filename = shift; |
my $filename = shift; |
return undef if (! tie(%persistent_db,'GDBM_File', |
return undef if (! tie(%persistent_db,'GDBM_File', |
$filename,&GDBM_WRCREAT,0640)); |
$filename,&GDBM_WRCREAT(),0640)); |
foreach my $name (keys(%save)) { |
foreach my $name (keys(%save)) { |
next if (! exists($save{$name})); |
next if (! exists($save{$name})); |
next if (! defined($save{$name}) || $save{$name} eq ''); |
next if (! defined($save{$name}) || $save{$name} eq ''); |
Line 760 sub make_form_data_persistent {
|
Line 808 sub make_form_data_persistent {
|
my $filename = shift; |
my $filename = shift; |
my %save; |
my %save; |
foreach (keys(%ENV)) { |
foreach (keys(%ENV)) { |
next if (! /^form/ || /submit/); |
next if (!/^form/ || /submit/); |
$save{$_} = $ENV{$_}; |
$save{$_} = $ENV{$_}; |
} |
} |
return &make_persistent($r,\%save,$filename); |
return &make_persistent($r,\%save,$filename); |
Line 1095 sub parse_advanced_search {
|
Line 1143 sub parse_advanced_search {
|
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
# Preprocess the category form element. |
# Preprocess the category form element. |
|
$ENV{'form.category'} = 'any' if (ref($ENV{'form.category'})); |
if ($ENV{'form.category'} ne 'any') { |
if ($ENV{'form.category'} ne 'any') { |
my @extensions = &Apache::loncommon::filecategorytypes |
my @extensions = &Apache::loncommon::filecategorytypes |
($ENV{'form.category'}); |
($ENV{'form.category'}); |
Line 1109 sub parse_advanced_search {
|
Line 1158 sub parse_advanced_search {
|
} |
} |
} |
} |
unless ($fillflag) { |
unless ($fillflag) { |
&output_blank_field_error($r,$closebutton); |
&output_blank_field_error($r,$closebutton,'phase=disp_adv'); |
return ; |
return ; |
} |
} |
# Turn the form input into a SQL-based query |
# Turn the form input into a SQL-based query |
Line 1266 sub parse_basic_search {
|
Line 1315 sub parse_basic_search {
|
|
|
# Check to see if enough is filled in |
# Check to see if enough is filled in |
unless (&filled($ENV{'form.basicexp'})) { |
unless (&filled($ENV{'form.basicexp'})) { |
&output_blank_field_error($r,$closebutton); |
&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>'; |
Line 1502 sub build_date_queries {
|
Line 1551 sub build_date_queries {
|
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
|
sub copyright_check { |
sub copyright_check { |
my $Metadata = shift; |
my $Metadata = shift; |
# Check copyright tags and skip results the user cannot use |
# Check copyright tags and skip results the user cannot use |
Line 1522 sub copyright_check {
|
Line 1570 sub copyright_check {
|
return 1; |
return 1; |
} |
} |
|
|
|
|
|
###################################################################### |
|
###################################################################### |
|
|
|
=pod |
|
|
|
=item &ensure_db_and_table |
|
|
|
Ensure we can get lonmysql to connect to the database and the table we |
|
need exists. |
|
|
|
Inputs: $r, table id |
|
|
|
Returns: undef on error, 1 if the table exists. |
|
|
|
=cut |
|
|
|
###################################################################### |
|
###################################################################### |
|
sub ensure_db_and_table { |
|
my ($r,$table) = @_; |
|
## |
|
## Sanity check the table id. |
|
## |
|
if (! defined($table) || $table eq '' || $table =~ /\D/ ) { |
|
$r->print("Unable to retrieve search results. ". |
|
"Unable to determine the table results were stored in. ". |
|
"</body></html>"); |
|
return undef; |
|
} |
|
## |
|
## Make sure we can connect and the table exists. |
|
## |
|
my $connection_result = &Apache::lonmysql::connect_to_db(); |
|
if (!defined($connection_result)) { |
|
$r->print("Unable to connect to the MySQL database where your results". |
|
" are stored. </body></html>"); |
|
&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to". |
|
" connect to database."); |
|
&Apache::lonnet::logthis(&Apache::lonmysql::get_error()); |
|
return undef; |
|
} |
|
my $table_check = &Apache::lonmysql::check_table($table); |
|
if (! defined($table_check)) { |
|
$r->print("A MySQL error has occurred.</form></body></html>"); |
|
&Apache::lonnet::logthis("lonmysql was unable to determine the status". |
|
" of table ".$table); |
|
return undef; |
|
} elsif (! $table_check) { |
|
$r->print("The table of results could not be found."); |
|
&Apache::lonnet::logthis("The user requested a table, ".$table. |
|
", that could not be found."); |
|
return undef; |
|
} |
|
return 1; |
|
} |
|
|
|
###################################################################### |
|
###################################################################### |
|
|
|
=pod |
|
|
|
=item &print_sort_form |
|
|
|
=cut |
|
|
|
###################################################################### |
|
###################################################################### |
|
sub print_sort_form { |
|
my ($r,$pretty_query_string) = @_; |
|
## |
|
my %SortableFields = |
|
(id => 'Default', |
|
title => 'Title', |
|
author => 'Author', |
|
subject => 'Subject', |
|
url => 'URL', |
|
version => 'Version Number', |
|
mime => 'Mime type', |
|
lang => 'Language', |
|
owner => 'Owner/Publisher', |
|
copyright => 'Copyright', |
|
hostname => 'Host', |
|
creationdate => 'Creation Date', |
|
lastrevisiondate => 'Revision Date', |
|
); |
|
## |
|
my $table = $ENV{'form.table'}; |
|
return if (! &ensure_db_and_table($r,$table)); |
|
## |
|
## Get the number of results |
|
## |
|
my $total_results = &Apache::lonmysql::number_of_rows($table); |
|
if (! defined($total_results)) { |
|
$r->print("A MySQL error has occurred.</form></body></html>"); |
|
&Apache::lonnet::logthis("lonmysql was unable to determine the number". |
|
" of rows in table ".$table); |
|
&Apache::lonnet::logthis(&Apache::lonmysql::get_error()); |
|
return; |
|
} |
|
my $result; |
|
$result.=<<END; |
|
<html> |
|
<head> |
|
<script> |
|
function change_sort() { |
|
var newloc = "/adm/searchcat?phase=results"; |
|
newloc += "&persistent_db_id=$ENV{'form.persistent_db_id'}"; |
|
newloc += "&sortby="; |
|
newloc += document.forms.statusform.elements.sortby.value; |
|
parent.resultsframe.location= newloc; |
|
} |
|
</script> |
|
<title>Results</title> |
|
</head> |
|
<body> |
|
<form name="statusform" action="" method="post"> |
|
END |
|
|
|
#<h2>Sort Results</h2> |
|
#Sort by: <select size="1" name="sortby" onchange="javascript:change_sort();"> |
|
# $ENV{'form.sortby'} = 'id' if (! defined($ENV{'form.sortby'})); |
|
# foreach (keys(%SortableFields)) { |
|
# $result.="<option name=\"$_\""; |
|
# if ($_ eq $ENV{'form.sortby'}) { |
|
# $result.=" selected "; |
|
# } |
|
# $result.=" >$SortableFields{$_}</option>\n"; |
|
# } |
|
# $result.="</select>\n"; |
|
my $revise = &revise_button(); |
|
$result.=<<END; |
|
<p> |
|
There are $total_results matches to your query. $revise |
|
</p><p> |
|
Search:$pretty_query_string |
|
</p> |
|
</form> |
|
</body> |
|
</html> |
|
END |
|
$r->print($result); |
|
return; |
|
} |
|
|
##################################################################### |
##################################################################### |
##################################################################### |
##################################################################### |
|
|
Line 1545 my @DataOrder = qw/id title author subje
|
Line 1738 my @DataOrder = qw/id title author subje
|
abstract mime lang owner copyright creationdate lastrevisiondate hostname/; |
abstract mime lang owner copyright creationdate lastrevisiondate hostname/; |
|
|
my %Datatypes = |
my %Datatypes = |
( id =>{ type => 'INT', |
( id =>{ type => 'MEDIUMINT', |
restrictions => 'NOT NULL', |
restrictions => 'UNSIGNED NOT NULL', |
primary_key => 'yes', |
primary_key => 'yes', |
auto_inc => 'yes' |
auto_inc => 'yes' |
}, |
}, |
Line 1571 my %Datatypes =
|
Line 1764 my %Datatypes =
|
); |
); |
|
|
my @Fullindicies = |
my @Fullindicies = |
qw/title author subject abstract mime language owner copyright/; |
qw/title/; |
|
# qw/title author subject abstract mime language owner copyright/; |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
Line 1603 sub create_results_table {
|
Line 1797 sub create_results_table {
|
} |
} |
return undef; # Error... |
return undef; # Error... |
} |
} |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
|
=pod |
=pod |
|
|
=item &write_status() |
=item Search Status update functions |
|
|
|
Each of the following functions changes the values of one of the |
|
input fields used to display the search status to the user. The names |
|
should be explanatory. |
|
|
|
Inputs: Apache request handler ($r), text to display. |
|
|
|
Returns: Nothing. |
|
|
|
=over 4 |
|
|
|
=item &update_count_status() |
|
|
|
=item &update_status() |
|
|
|
=item &update_seconds() |
|
|
|
=back |
|
|
=cut |
=cut |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub write_status { |
sub update_count_status { |
my ($r,$string) = @_; |
my ($r,$text) = @_; |
$string =~ s/(\')/\$1/g; |
$text =~ s/\'/\\\'/g; |
$string =~ s/\n//sg; |
$r->print |
# $r->print("<script>alert('$string');</script>\n"); |
("<script>document.statusform.count.value = ' $text'</script>\n"); |
# $r->rflush(); |
$r->rflush(); |
return; |
} |
|
|
|
sub update_status { |
|
my ($r,$text) = @_; |
|
$text =~ s/\'/\\\'/g; |
|
$r->print |
|
("<script>document.statusform.status.value = ' $text'</script>\n"); |
|
$r->rflush(); |
|
} |
|
|
|
sub update_seconds { |
|
my ($r,$text) = @_; |
|
$text =~ s/\'/\\\'/g; |
|
$r->print |
|
("<script>document.statusform.seconds.value = ' $text'</script>\n"); |
|
$r->rflush(); |
|
} |
|
|
|
###################################################################### |
|
###################################################################### |
|
|
|
=pod |
|
|
|
=item &revise_button |
|
|
|
Inputs: None |
|
|
|
Returns: html string for a 'revise search' button. |
|
|
|
=cut |
|
|
|
###################################################################### |
|
###################################################################### |
|
sub revise_button { |
|
my $revise_phase = 'disp_basic'; |
|
$revise_phase = 'disp_adv' if ($ENV{'form.searchmode'} eq 'advanced'); |
|
my $newloc = '/adm/searchcat'. |
|
'?persistent_db_id='.$ENV{'form.persistent_db_id'}. |
|
'&phase='.$revise_phase; |
|
my $result = qq{<input type="button" value="Revise search" name="revise"} . |
|
qq{ onClick="parent.location='$newloc';" /> }; |
|
return $result; |
} |
} |
|
|
###################################################################### |
###################################################################### |
Line 1636 sub write_status {
|
Line 1890 sub write_status {
|
###################################################################### |
###################################################################### |
sub run_search { |
sub run_search { |
my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_; |
my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_; |
|
my $connection = $r->connection; |
# |
# |
# Timing variables |
# Timing variables |
# |
# |
my $starttime = time; |
my $starttime = time; |
my $max_time = 120; # seconds for the search to complete |
my $max_time = 30; # seconds for the search to complete |
# |
# |
# Print run_search header |
# Print run_search header |
# |
# |
$r->print("<html><head><title>Search Status</title></head><body>"); |
$r->print(<<END); |
$r->print("Search: ".$pretty_string."<br />\n"); |
<html> |
|
<head><title>Search Status</title></head> |
|
<body> |
|
<form name="statusform" action="" method="post"> |
|
<input type="hidden" name="Queue" value="" /> |
|
END |
|
# Check to see if $pretty_string has more than one carriage return. |
|
# Assume \n s are following <br /> s and truncate the value. |
|
# (there is probably a better way)... |
|
my @Lines = split /\n/,$pretty_string; |
|
if (@Lines > 1) { |
|
$pretty_string = join /\n/,(@Lines[0..1],'....<br />'); |
|
} |
|
$r->print("Search: ".$pretty_string); |
$r->rflush(); |
$r->rflush(); |
# |
# |
# Determine the servers we need to contact. |
# Determine the servers we need to contact. |
Line 1658 sub run_search {
|
Line 1926 sub run_search {
|
} |
} |
my %Server_status; |
my %Server_status; |
my $table =$ENV{'form.table'}; |
my $table =$ENV{'form.table'}; |
if (! defined($table) || $table eq '') { |
if (! defined($table) || $table eq '' || $table =~ /\D/ ) { |
$r->print("Unable to determine table id to store search results in.". |
$r->print("Unable to determine table id to store search results in.". |
"The search has been aborted."); |
"The search has been aborted.</body></html>"); |
return; |
return; |
} |
} |
my $table_status = &Apache::lonmysql::check_table($table); |
my $table_status = &Apache::lonmysql::check_table($table); |
Line 1674 sub run_search {
|
Line 1942 sub run_search {
|
} |
} |
if (! $table_status) { |
if (! $table_status) { |
$r->print("The table id,$table, we tried to use is invalid.". |
$r->print("The table id,$table, we tried to use is invalid.". |
"The search has been aborted."); |
"The search has been aborted.</body></html>"); |
return; |
return; |
} |
} |
## |
## |
Line 1683 sub run_search {
|
Line 1951 sub run_search {
|
my $hitcountsum; |
my $hitcountsum; |
my $server; |
my $server; |
my $status; |
my $status; |
$r->print("Searching"); |
my $revise = &revise_button(); |
while ((time - $starttime < $max_time) && |
$r->print(<<END); |
|
<table> |
|
<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr> |
|
<tr> |
|
<td><input type="text" name="status" value="" size="30" /></td> |
|
<td><input type="text" name="count" value="" size="10" /></td> |
|
<td><input type="text" name="seconds" value="" size="8" /></td> |
|
<td>$revise</td> |
|
</tr> |
|
</table> |
|
</form> |
|
END |
|
$r->rflush(); |
|
my $time_remaining = $max_time - (time - $starttime) ; |
|
my $last_time = $time_remaining; |
|
&update_seconds($r,$time_remaining); |
|
while (($time_remaining > 0) && |
((@Servers_to_contact) || keys(%Server_status))) { |
((@Servers_to_contact) || keys(%Server_status))) { |
# Send out a search request if it needs to be done. |
# Send out a search request if it needs to be done. |
if (@Servers_to_contact) { |
if (@Servers_to_contact) { |
Line 1694 sub run_search {
|
Line 1978 sub run_search {
|
$customshow,[$server]); |
$customshow,[$server]); |
($server) = keys(%$reply); |
($server) = keys(%$reply); |
$Server_status{$server} = $reply->{$server}; |
$Server_status{$server} = $reply->{$server}; |
# $r->print("Contacted:$server:reply:$Server_status{$server}"); |
&update_status($r,'contacting '.$server); |
$r->print(" ."); |
|
$r->rflush(); |
|
} else { |
} else { |
sleep(1); # wait a sec. to give time for files to be written |
# wait a sec. to give time for files to be written |
|
# This sleep statement is here instead of outside the else |
|
# block because we do not want to pause if we have servers |
|
# left to contact. |
|
sleep(1); |
} |
} |
|
&update_status($r,'waiting on '.(join(' ',keys(%Server_status)))); |
while (my ($server,$status) = each(%Server_status)) { |
while (my ($server,$status) = each(%Server_status)) { |
|
last if ($connection->aborted()); |
if ($status eq 'con_lost') { |
if ($status eq 'con_lost') { |
delete ($Server_status{$server}); |
delete ($Server_status{$server}); |
# $r->print("server $server is not responding."); |
|
next; |
next; |
} |
} |
$status=~/^([\.\w]+)$/; |
$status=~/^([\.\w]+)$/; |
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1; |
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1; |
if (-e $datafile && ! -e "$datafile.end") { |
if (-e $datafile && ! -e "$datafile.end") { |
# Let the user know we are receiving data from the server |
&update_status($r,'Receiving results from '.$server); |
# $r->print("$server:Receiving file"); |
|
next; |
next; |
} |
} |
|
last if ($connection->aborted()); |
if (-e "$datafile.end") { |
if (-e "$datafile.end") { |
|
&update_status($r,'Reading results from '.$server); |
if (-z "$datafile") { |
if (-z "$datafile") { |
delete($Server_status{$server}); |
delete($Server_status{$server}); |
next; |
next; |
} |
} |
my $fh; |
my $fh; |
if (!($fh=Apache::File->new($datafile))) { |
if (!($fh=Apache::File->new($datafile))) { |
# Error opening file... |
|
# Tell the user and exit...? |
|
# Should I give up on opening it? |
|
$r->print("Unable to open search results file for ". |
$r->print("Unable to open search results file for ". |
"server $server. Omitting from search"); |
"server $server. Omitting from search"); |
next; |
delete($Server_status{$server}); |
|
next; |
} |
} |
# Read in the whole file. |
# Read in the whole file. |
while (my $result = <$fh>) { |
while (my $result = <$fh>) { |
|
last if ($connection->aborted()); |
# handle custom fields? Someday we will! |
# handle custom fields? Someday we will! |
chomp($result); |
chomp($result); |
next unless $result; |
next unless $result; |
Line 1743 sub run_search {
|
Line 2030 sub run_search {
|
} |
} |
# $r->print(&Apache::lonmysql::get_debug()); |
# $r->print(&Apache::lonmysql::get_debug()); |
$hitcountsum ++; |
$hitcountsum ++; |
|
$time_remaining = $max_time - (time - $starttime) ; |
|
if ($last_time - $time_remaining > 0) { |
|
&update_seconds($r,$time_remaining); |
|
$last_time = $time_remaining; |
|
} |
|
if ($hitcountsum % 50 == 0) { |
|
&update_count_status($r,$hitcountsum); |
|
} |
} # End of foreach (@results) |
} # End of foreach (@results) |
$fh->close(); |
$fh->close(); |
# $server is only deleted if the results file has been |
# $server is only deleted if the results file has been |
# found and (successfully) opened. This may be a bad idea. |
# found and (successfully) opened. This may be a bad idea. |
delete($Server_status{$server}); |
delete($Server_status{$server}); |
# $r->print("Received $new_count more results from ". |
|
# $server."."); |
|
} |
} |
|
last if ($connection->aborted()); |
|
&update_count_status($r,$hitcountsum); |
} |
} |
|
last if ($connection->aborted()); |
# Finished looping through the servers |
# Finished looping through the servers |
|
$time_remaining = $max_time - (time - $starttime) ; |
|
if ($last_time - $time_remaining > 0) { |
|
$last_time = $time_remaining; |
|
&update_seconds($r,$time_remaining); |
|
} |
} |
} |
|
&update_status($r,'Search Complete'.$server); |
|
&update_seconds($r,0); |
&Apache::lonmysql::disconnect_from_db(); |
&Apache::lonmysql::disconnect_from_db(); |
# Let the user know |
|
# |
|
# We have run out of time or run out of servers to talk to and |
# We have run out of time or run out of servers to talk to and |
# results to get. |
# results to get. |
$r->print("<br /><b>Search Completed</b><br />"); |
|
if ($hitcountsum) { |
|
$r->print($hitcountsum." successful matches were found.<br />"); |
|
} else { |
|
$r->print("There were no successful matches to your query.<br />"); |
|
} |
|
$r->print("</body></html>"); |
$r->print("</body></html>"); |
|
$r->print("<script>window.location='/adm/searchcat?phase=sort&persistent_db_id=$ENV{'form.persistent_db_id'}';</script>"); |
return; |
return; |
} |
} |
|
|
Line 1786 sub prev_next_buttons {
|
Line 2082 sub prev_next_buttons {
|
## |
## |
## Prev |
## Prev |
my $prev_min = $current_min - $show; |
my $prev_min = $current_min - $show; |
$prev_min = 0 if $prev_min < 0; |
$prev_min = 1 if $prev_min < 1; |
if ($prev_min < $current_min) { |
if ($prev_min < $current_min) { |
$links .= qq{ |
$links .= qq{ |
<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a> |
<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a> |
Line 1825 sub prev_next_buttons {
|
Line 2121 sub prev_next_buttons {
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub display_results { |
sub display_results { |
my ($r,$mode,$importbutton,$closebutton) = @_; |
my ($r,$importbutton,$closebutton) = @_; |
$r->print(&search_results_header()); |
my $connection = $r->connection; |
|
$r->print(&search_results_header($importbutton,$closebutton)); |
## |
## |
## Set viewing function |
## Set viewing function |
## |
## |
Line 1845 sub display_results {
|
Line 2142 sub display_results {
|
## |
## |
if ($ENV{'form.catalogmode'} eq 'groupsearch') { |
if ($ENV{'form.catalogmode'} eq 'groupsearch') { |
if (! tie(%groupsearch_db,'GDBM_File',$diropendb, |
if (! tie(%groupsearch_db,'GDBM_File',$diropendb, |
&GDBM_WRCREAT,0640)) { |
&GDBM_WRCREAT(),0640)) { |
$r->print('Unable to tie hash to db file</body></html>'); |
$r->print('Unable to store import results.</form></body></html>'); |
$r->rflush(); |
$r->rflush(); |
return; |
return; |
} |
} |
Line 1855 sub display_results {
|
Line 2152 sub display_results {
|
## Prepare the table for querying |
## Prepare the table for querying |
## |
## |
my $table = $ENV{'form.table'}; |
my $table = $ENV{'form.table'}; |
my $connection_result = &Apache::lonmysql::connect_to_db(); |
return if (! &ensure_db_and_table($r,$table)); |
if (!defined($connection_result)) { |
|
$r->print(&Apache::lonmysql::get_error()); |
|
} |
|
my $table_check = &Apache::lonmysql::check_table($table); |
|
if (! defined($table_check)) { |
|
$r->print("A MySQL error has occurred.</body></html>"); |
|
&Apache::lonnet::logthis("lonmysql was unable to determine the status". |
|
" of table ".$table); |
|
return; |
|
} elsif (! $table_check) { |
|
$r->print("The table of results could not be found."); |
|
&Apache::lonnet::logthis("The user requested a table, ".$table. |
|
", that could not be found."); |
|
return; |
|
} |
|
## |
## |
## Get the number of results |
## Get the number of results |
## |
## |
my $total_results = &Apache::lonmysql::number_of_rows($table); |
my $total_results = &Apache::lonmysql::number_of_rows($table); |
if (! defined($total_results)) { |
if (! defined($total_results)) { |
$r->print("A MySQL error has occurred.</body></html>"); |
$r->print("A MySQL error has occurred.</form></body></html>"); |
&Apache::lonnet::logthis("lonmysql was unable to determine the number". |
&Apache::lonnet::logthis("lonmysql was unable to determine the number". |
" of rows in table ".$table); |
" of rows in table ".$table); |
&Apache::lonnet::logthis(&Apache::lonmysql::get_error()); |
&Apache::lonnet::logthis(&Apache::lonmysql::get_error()); |
&Apache::lonnet::logthis(&Apache::lonmysql::get_debug()); |
|
return; |
|
} |
|
if ($total_results == 0) { |
|
$r->print("There were no results matching your query.\n". |
|
"</form></body></html>"); |
|
return; |
return; |
} |
} |
## |
## |
## Determine how many results we need to get |
## Determine how many results we need to get |
## |
## |
$ENV{'form.show'} = 20; |
$ENV{'form.start'} = 1 if (! exists($ENV{'form.start'})); |
$ENV{'form.start'} = 0 if (! exists($ENV{'form.start'})); |
$ENV{'form.show'} = 'all' if (! exists($ENV{'form.show'})); |
$ENV{'form.show'} = 'all' if (! exists($ENV{'form.show'})); |
|
my $min = $ENV{'form.start'}; |
my $min = $ENV{'form.start'}; |
my $max; |
my $max; |
if ($ENV{'form.show'} eq 'all') { |
if ($ENV{'form.show'} eq 'all') { |
$max = $total_results ; |
$max = $total_results ; |
} else { |
} else { |
$max = $min + $ENV{'form.show'}; |
$max = $min + $ENV{'form.show'} - 1; |
$max = $total_results if ($max > $total_results); |
$max = $total_results if ($max > $total_results); |
} |
} |
## |
## |
## Output links (if necessary) for 'prev' and 'next' pages. |
## Output links (if necessary) for 'prev' and 'next' pages. |
## |
## |
$r->print("<center>Results $min to $max out of $total_results</center>\n"); |
|
$r->print |
$r->print |
('<br /><center>'. |
('<center>'. |
&prev_next_buttons($min,$ENV{'form.show'},$total_results, |
&prev_next_buttons($min,$ENV{'form.show'},$total_results, |
"table=".$ENV{'form.table'}. |
"table=".$ENV{'form.table'}. |
"&phase=results". |
"&phase=results". |
"&persistent_db_id=".$ENV{'form.persistent_db_id'}) |
"&persistent_db_id=".$ENV{'form.persistent_db_id'}) |
."</center><br />\n" |
."</center>\n" |
); |
); |
|
if ($total_results == 0) { |
|
$r->print("There are currently no results.\n". |
|
"</form></body></html>"); |
|
return; |
|
} else { |
|
$r->print |
|
("<center>Results $min to $max out of $total_results</center>\n"); |
|
} |
## |
## |
## Get results from MySQL table |
## Get results from MySQL table |
## |
## |
my @Results = &Apache::lonmysql::get_rows($table, |
my @Results = &Apache::lonmysql::get_rows($table, |
'id>'.$min.' AND id<='.$max); |
'id>='.$min.' AND id<='.$max); |
## |
## |
## Loop through the results and output them. |
## Loop through the results and output them. |
## |
## |
foreach my $row (@Results) { |
foreach my $row (@Results) { |
|
if ($connection->aborted()) { |
|
untie %groupsearch_db if (tied(%groupsearch_db)); |
|
&Apache::lonmysql::disconnect_from_db(); |
|
return; |
|
} |
my %Fields = %{&parse_row(@$row)}; |
my %Fields = %{&parse_row(@$row)}; |
my $output="<p>\n"; |
my $output="<p>\n"; |
$output.=&catalogmode_output($Fields{'title'},$Fields{'url'}); |
my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'}); |
# Render the result into html |
# Render the result into html |
$output.= &$viewfunction(%Fields); |
$output.= &$viewfunction($prefix,%Fields); |
$output.="</p>\n<hr align='left' width='200' noshade />"; |
|
# Print them out as they come in. |
# Print them out as they come in. |
$r->print($output); |
$r->print($output); |
$r->rflush(); |
$r->rflush(); |
Line 1937 sub display_results {
|
Line 2223 sub display_results {
|
$r->print("There were no results matching your query"); |
$r->print("There were no results matching your query"); |
} else { |
} else { |
$r->print |
$r->print |
('<br /><center>'. |
('<center>'. |
&prev_next_buttons($min,$ENV{'form.show'},$total_results, |
&prev_next_buttons($min,$ENV{'form.show'},$total_results, |
"table=".$ENV{'form.table'}. |
"table=".$ENV{'form.table'}. |
"&phase=results". |
"&phase=results". |
"&persistent_db_id=". |
"&persistent_db_id=". |
$ENV{'form.persistent_db_id'}) |
$ENV{'form.persistent_db_id'}) |
."</center><br />\n" |
."</center>\n" |
); |
); |
} |
} |
$r->print("</body></html>"); |
$r->print("</form></body></html>"); |
$r->rflush(); |
$r->rflush(); |
untie %groupsearch_db; |
untie %groupsearch_db if (tied(%groupsearch_db)); |
return; |
return; |
} |
} |
|
|
Line 1968 $ENV{'form.catalogmode'}. Stores data i
|
Line 2254 $ENV{'form.catalogmode'}. Stores data i
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
{ |
{ |
my $fnum; |
my $fnum = 0; |
|
|
sub catalogmode_output { |
sub catalogmode_output { |
my $output = ''; |
my $output = ''; |
my ($title,$url) = @_; |
my ($title,$url) = @_; |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
$title=~ s/\'/\\'/g; # ' Escape single quotes. |
$title=~ s/\'/\\\'/g; |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
$output.=<<END |
$output.=<<END |
<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT" |
<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT" |
Line 1982 onClick="javascript:select_data('$title'
|
Line 2268 onClick="javascript:select_data('$title'
|
</font> |
</font> |
END |
END |
} |
} |
} |
} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') { |
if ($ENV{'form.catalogmode'} eq 'groupsearch') { |
|
$fnum+=0; |
|
$groupsearch_db{"pre_${fnum}_link"}=$url; |
$groupsearch_db{"pre_${fnum}_link"}=$url; |
$groupsearch_db{"pre_${fnum}_title"}=$title; |
$groupsearch_db{"pre_${fnum}_title"}=$title; |
$output.=<<END; |
$output.=<<END; |
Line 2195 Checked for existance & 'edit' mode.
|
Line 2479 Checked for existance & 'edit' mode.
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub search_results_header { |
sub search_results_header { |
|
my ($importbutton,$closebutton) = @_; |
my $result = ''; |
my $result = ''; |
# output beginning of search page |
# output beginning of search page |
# conditional output of script functions dependent on the mode in |
# conditional output of script functions dependent on the mode in |
Line 2206 sub search_results_header {
|
Line 2491 sub search_results_header {
|
function select_data(title,url) { |
function select_data(title,url) { |
changeTitle(title); |
changeTitle(title); |
changeURL(url); |
changeURL(url); |
self.close(); |
parent.close(); |
} |
} |
function changeTitle(val) { |
function changeTitle(val) { |
if (opener.inf.document.forms.resinfo.elements.t) { |
if (opener.inf.document.forms.resinfo.elements.t) { |
Line 2227 SCRIPT
|
Line 2512 SCRIPT
|
<script type="text/javascript"> |
<script type="text/javascript"> |
function select_data(title,url) { |
function select_data(title,url) { |
changeURL(url); |
changeURL(url); |
self.close(); |
parent.close(); |
} |
} |
function changeTitle(val) { |
function changeTitle(val) { |
} |
} |
function changeURL(val) { |
function changeURL(val) { |
if (window.opener.document) { |
if (parent.targetwin.document) { |
window.opener.document.forms["$form"].elements["$element"].value=val; |
parent.targetwin.document.forms["$form"].elements["$element"].value=val; |
} else { |
} else { |
var url = 'forms[\"$form\"].elements[\"$element\"].value'; |
var url = 'forms[\"$form\"].elements[\"$element\"].value'; |
alert("Unable to transfer data to "+url); |
alert("Unable to transfer data to "+url); |
Line 2245 SCRIPT
|
Line 2530 SCRIPT
|
} |
} |
$result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch'; |
$result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch'; |
<script type="text/javascript"> |
<script type="text/javascript"> |
function select_data(title,url) { |
|
// alert('DEBUG: Should be storing '+title+' and '+url); |
|
} |
|
function queue(val) { |
function queue(val) { |
if (eval("document.forms.results.returnvalues["+val+"].checked")) { |
if (document.forms.results.returnvalues[val].checked) { |
document.forms.results.acts.value+='1a'+val+'b'; |
parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b'; |
} |
} else { |
else { |
parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b'; |
document.forms.results.acts.value+='0a'+val+'b'; |
} |
} |
|
} |
} |
function select_group() { |
function select_group() { |
window.location= |
parent.window.location= |
"/adm/groupsort?mode=$ENV{'form.mode'}&catalogmode=groupsearch&acts="+ |
"/adm/groupsort?mode=$ENV{'form.mode'}&catalogmode=groupsearch&acts="+ |
document.forms.results.acts.value; |
parent.statusframe.document.forms.statusform.elements.Queue.value; |
} |
} |
</script> |
</script> |
SCRIPT |
SCRIPT |
$result.=<<END; |
$result.=<<END; |
</head> |
</head> |
|
<form name="results" method="post" action="" > |
|
<input type="hidden" name="Queue" value="" /> |
|
$importbutton |
END |
END |
return $result; |
return $result; |
} |
} |
Line 2280 Sending search request to LON-CAPA serve
|
Line 2564 Sending search request to LON-CAPA serve
|
ENDSTATUS |
ENDSTATUS |
} |
} |
|
|
|
sub results_link { |
|
my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}. |
|
"&persistent_db_id=".$ENV{'form.persistent_db_id'}; |
|
my $results_link = $basic_link."&phase=results". |
|
"&pause=1"."&start=1"; |
|
return $results_link; |
|
} |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub print_frames_interface { |
sub print_frames_interface { |
Line 2287 sub print_frames_interface {
|
Line 2579 sub print_frames_interface {
|
my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}. |
my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}. |
"&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 = $basic_link."&phase=results". |
my $results_link = &results_link(); |
"&pause=10"."&start=0"."&show=20"; |
|
my $result = <<"ENDFRAMES"; |
my $result = <<"ENDFRAMES"; |
<html> |
<html> |
<head> |
<head> |
|
<script> |
|
var targetwin = opener; |
|
</script> |
<title>LON-CAPA Digital Library Search Results</title> |
<title>LON-CAPA Digital Library Search Results</title> |
</head> |
</head> |
<frameset rows="150,*"> |
<frameset rows="150,*"> |
Line 2327 extra custom metadata to show.
|
Line 2621 extra custom metadata to show.
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub detailed_citation_view { |
sub detailed_citation_view { |
my %values = @_; |
my ($prefix,%values) = @_; |
my $result=<<END; |
my $result=<<END; |
<h3><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
<b>$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
target='search_preview'>$values{'title'}</a></h3> |
target='search_preview'>$values{'title'}</a></b> |
<p> |
<p> |
<b>$values{'author'}</b>, <i>$values{'owner'}</i><br /> |
<b>$values{'author'}</b>, <i>$values{'owner'}</i><br /> |
|
|
Line 2345 $values{'extrashow'}
|
Line 2639 $values{'extrashow'}
|
<p> |
<p> |
$values{'shortabstract'} |
$values{'shortabstract'} |
</p> |
</p> |
|
<hr align='left' width='200' noshade /> |
END |
END |
return $result; |
return $result; |
} |
} |
Line 2360 END
|
Line 2655 END
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub summary_view { |
sub summary_view { |
my %values = @_; |
my ($prefix,%values) = @_; |
my $result=<<END; |
my $result=<<END; |
<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
target='search_preview'>$values{'author'}</a><br /> |
target='search_preview'>$values{'author'}</a><br /> |
$values{'title'}<br /> |
$values{'title'}<br /> |
$values{'owner'} -- $values{'lastrevisiondate'}<br /> |
$values{'owner'} -- $values{'lastrevisiondate'}<br /> |
$values{'copyrighttag'}<br /> |
$values{'copyrighttag'}<br /> |
$values{'extrashow'} |
$values{'extrashow'} |
</p> |
</p> |
|
<hr align='left' width='200' noshade /> |
|
END |
|
return $result; |
|
} |
|
|
|
###################################################################### |
|
###################################################################### |
|
|
|
=pod |
|
|
|
=item &compact_view() |
|
|
|
=cut |
|
|
|
###################################################################### |
|
###################################################################### |
|
sub compact_view { |
|
my ($prefix,%values) = @_; |
|
my $result=<<END; |
|
$prefix <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'> |
|
$values{'title'}</a> |
|
<b>$values{'author'}</b><br /> |
END |
END |
return $result; |
return $result; |
} |
} |
|
|
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
|
Line 2385 END
|
Line 2703 END
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub fielded_format_view { |
sub fielded_format_view { |
my %values = @_; |
my ($prefix,%values) = @_; |
my $result=<<END; |
my $result=<<END; |
|
$prefix |
<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
target='search_preview'>$values{'url'}</a> |
target='search_preview'>$values{'url'}</a> |
<br /> |
<br /> |
Line 2405 sub fielded_format_view {
|
Line 2724 sub fielded_format_view {
|
<b>Abstract:</b> $values{'shortabstract'}<br /> |
<b>Abstract:</b> $values{'shortabstract'}<br /> |
$values{'extrashow'} |
$values{'extrashow'} |
</p> |
</p> |
|
<hr align='left' width='200' noshade /> |
END |
END |
return $result; |
return $result; |
} |
} |
Line 2423 END
|
Line 2743 END
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub xml_sgml_view { |
sub xml_sgml_view { |
my %values = @_; |
my ($prefix,%values) = @_; |
my $result=<<END; |
my $result=<<END; |
|
$prefix |
<pre> |
<pre> |
<LonCapaResource> |
<LonCapaResource> |
<url>$values{'url'}</url> |
<url>$values{'url'}</url> |
Line 2453 sub xml_sgml_view {
|
Line 2774 sub xml_sgml_view {
|
</LonCapaResource> |
</LonCapaResource> |
</pre> |
</pre> |
$values{'extrashow'} |
$values{'extrashow'} |
|
<hr align='left' width='200' noshade /> |
END |
END |
return $result; |
return $result; |
} |
} |
Line 2485 sub filled {
|
Line 2807 sub filled {
|
|
|
=item &output_blank_field_error() |
=item &output_blank_field_error() |
|
|
|
Output a complete page that indicates the user has not filled in enough |
|
information to do a search. |
|
|
|
Inputs: $r (Apache request handle), $closebutton, $parms. |
|
|
|
Returns: nothing |
|
|
|
$parms is extra information to include in the 'Revise search request' link. |
|
|
=cut |
=cut |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub output_blank_field_error { |
sub output_blank_field_error { |
my ($r,$closebutton)=@_; |
my ($r,$closebutton,$parms)=@_; |
# make query information persistent to allow for subsequent revision |
# make query information persistent to allow for subsequent revision |
$r->print(<<BEGINNING); |
$r->print(<<BEGINNING); |
<html> |
<html> |
Line 2504 BEGINNING
|
Line 2835 BEGINNING
|
<h1>Search Catalog</h1> |
<h1>Search Catalog</h1> |
<form method="post" action="/adm/searchcat"> |
<form method="post" action="/adm/searchcat"> |
$hidden_fields |
$hidden_fields |
<a href="/adm/searchcat?persistent_db_id=$ENV{'form.persistent_db_id'}" |
<a href="/adm/searchcat?$parms&persistent_db_id=$ENV{'form.persistent_db_id'}" |
>Revise search request</a> |
>Revise search request</a> |
$closebutton |
$closebutton |
<hr /> |
<hr /> |
<h3>Helpful Message</h3> |
<h3>Unactionable search query.</h3> |
<p> |
<p> |
Incorrect search query due to blank entry fields. |
You did not fill in enough information for the search to be started. |
You need to fill in the relevant |
You need to fill in relevant fields on the search page in order |
fields on the search page in order for a query to be |
for a query to be processed. |
processed. |
|
</p> |
</p> |
</body> |
</body> |
</html> |
</html> |
Line 2556 $hidden_fields
|
Line 2886 $hidden_fields
|
onClick='this.form.submit();' /> |
onClick='this.form.submit();' /> |
$closebutton |
$closebutton |
<hr /> |
<hr /> |
<h3>Helpful Message</h3> |
<h3>Error</h3> |
<p> |
<p> |
$message |
$message |
</p> |
</p> |