version 1.189, 2003/09/29 16:09:20
|
version 1.197, 2003/12/27 17:32:08
|
Line 59 search (on a server basis) is displayed
|
Line 59 search (on a server basis) is displayed
|
############################################################################### |
############################################################################### |
############################################################################### |
############################################################################### |
|
|
############################################################################### |
|
## ## |
|
## ORGANIZATION OF THIS PERL MODULE ## |
|
## ## |
|
## 1. Modules used by this module ## |
|
## 2. Variables used throughout the module ## |
|
## 3. handler subroutine called via Apache and mod_perl ## |
|
## 4. Other subroutines ## |
|
## ## |
|
############################################################################### |
|
|
|
package Apache::lonsearchcat; |
package Apache::lonsearchcat; |
|
|
# ------------------------------------------------- modules used by this module |
|
use strict; |
use strict; |
use Apache::Constants qw(:common :http); |
use Apache::Constants qw(:common :http); |
use Apache::lonnet(); |
use Apache::lonnet(); |
Line 84 use Apache::loncommon();
|
Line 72 use Apache::loncommon();
|
use Apache::lonmysql(); |
use Apache::lonmysql(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
|
# ---------------------------------------- variables used throughout the module |
|
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
## |
=pod |
## Global variables |
|
## |
=item Global variables |
|
|
|
=over 4 |
|
|
|
=item $importbutton |
|
|
|
button to take the select results and go to group sorting |
|
|
|
=item %groupsearch_db |
|
|
|
Database hash used to save values for the groupsearch RAT interface. |
|
|
|
=item $diropendb |
|
|
|
The full path to the (temporary) search database file. This is set and |
|
used in &handler() and is also used in &output_results(). |
|
|
|
=item %Views |
|
|
|
Hash which associates an output view description with the function |
|
that produces it. Adding a new view type should be as easy as |
|
adding a line to the definition of this hash and making sure the function |
|
takes the proper parameters. |
|
|
|
=item $bodytag |
|
|
|
LON-CAPA standard body tag, gotten from &Apache::lonnet::bodytag. |
|
No title, no table, just a <body> tag. |
|
|
|
=back |
|
|
|
=cut |
|
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
my %groupsearch_db; # Database hash used to save values for the |
# -- dynamically rendered interface components |
# groupsearch RAT interface. |
my $importbutton; # button to take the selected results and go to group sorting |
my %persistent_db; # gdbm hash which holds data which is supposed to |
|
# persist across calls to lonsearchcat.pm |
# -- miscellaneous variables |
## %Views: |
my %groupsearch_db; # database hash |
## Hash which associates an output view description with the function |
my $diropendb = ""; # db file |
## that produces it. |
# View Description Function Pointer |
# View Description/Name Function Pointer |
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); |
"Compact View" => \&compact_view); |
my %persistent_db; |
|
my $hidden_fields; |
|
my $bodytag; |
|
|
|
# |
|
# For course search |
|
# |
|
my %alreadyseen; |
|
my $hashtied; |
|
my %hash; |
|
my $totalfound; |
|
|
|
###################################################################### |
|
###################################################################### |
|
|
|
=pod |
|
|
|
=item &handler() - main handler invoked by httpd child |
|
|
|
=item Variables |
|
|
|
=over 4 |
|
|
|
=item $hidden |
|
|
|
holds 'hidden' html forms |
|
|
|
=item $scrout |
|
|
|
string that holds portions of the screen output |
|
|
|
=back |
|
|
|
=cut |
|
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
|
# &set_defaults(); |
|
# |
|
# set form defaults |
# |
# |
|
my $hidden_fields;# Hold all the hidden fields used to keep track |
|
# of the search system state |
|
my $importbutton; # button to take the selected results and go to group |
|
# sorting |
|
my $diropendb; # The full path to the (temporary) search database file. |
|
# This is set and used in &handler() and is also used in |
|
# &output_results(). |
|
my $bodytag; # LON-CAPA standard body tag, gotten from |
|
# &Apache::lonnet::bodytag. |
|
# No title, no table, just a <body> tag. |
|
|
my $loaderror=&Apache::lonnet::overloaderror($r); |
my $loaderror=&Apache::lonnet::overloaderror($r); |
if ($loaderror) { return $loaderror; } |
if ($loaderror) { return $loaderror; } |
Line 200 sub handler {
|
Line 133 sub handler {
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['catalogmode','launch','acts','mode','form','element','pause', |
['catalogmode','launch','acts','mode','form','element','pause', |
'phase','persistent_db_id','table','start','show', |
'phase','persistent_db_id','table','start','show', |
'cleargroupsort']); |
'cleargroupsort','titleelement']); |
## |
## |
## The following is a trick - we wait a few seconds if asked to so |
## The following is a trick - we wait a few seconds if asked to so |
## the daemon running the search can get ahead of the daemon |
## the daemon running the search can get ahead of the daemon |
Line 282 END
|
Line 215 END
|
$hidden_fields .= '<input type="hidden" name="element" value="'. |
$hidden_fields .= '<input type="hidden" name="element" value="'. |
$ENV{'form.element'}.'" />'."\n"; |
$ENV{'form.element'}.'" />'."\n"; |
} |
} |
|
if (exists($ENV{'form.titleelement'})) { |
|
$hidden_fields .= '<input type="hidden" name="titleelement" value="'. |
|
$ENV{'form.titleelement'}.'" />'."\n"; |
|
} |
if (exists($ENV{'form.mode'})) { |
if (exists($ENV{'form.mode'})) { |
$hidden_fields .= '<input type="hidden" name="mode" value="'. |
$hidden_fields .= '<input type="hidden" name="mode" value="'. |
$ENV{'form.mode'}.'" />'."\n"; |
$ENV{'form.mode'}.'" />'."\n"; |
Line 330 END
|
Line 267 END
|
## Switch on the phase |
## Switch on the phase |
## |
## |
if ($ENV{'form.phase'} eq 'disp_basic') { |
if ($ENV{'form.phase'} eq 'disp_basic') { |
&print_basic_search_form($r,$closebutton); |
&print_basic_search_form($r,$closebutton,$hidden_fields); |
} elsif ($ENV{'form.phase'} eq 'disp_adv') { |
} elsif ($ENV{'form.phase'} eq 'disp_adv') { |
&print_advanced_search_form($r,$closebutton); |
&print_advanced_search_form($r,$closebutton,$hidden_fields); |
} elsif ($ENV{'form.phase'} eq 'results') { |
} elsif ($ENV{'form.phase'} eq 'results') { |
&display_results($r,$importbutton,$closebutton); |
&display_results($r,$importbutton,$closebutton,$diropendb); |
} elsif ($ENV{'form.phase'} =~ /^(sort|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, |
Line 384 END
|
Line 321 END
|
my $pretty_string; |
my $pretty_string; |
if ($ENV{'form.phase'} eq 'basic_search') { |
if ($ENV{'form.phase'} eq 'basic_search') { |
($query,$pretty_string,$libraries) = |
($query,$pretty_string,$libraries) = |
&parse_basic_search($r,$closebutton); |
&parse_basic_search($r,$closebutton,$hidden_fields); |
} else { # Advanced search |
} else { # Advanced search |
($query,$customquery,$customshow,$libraries,$pretty_string) |
($query,$customquery,$customshow,$libraries,$pretty_string) |
= &parse_advanced_search($r,$closebutton); |
= &parse_advanced_search($r,$closebutton,$hidden_fields); |
return OK if (! defined($query)); |
return OK if (! defined($query)); |
} |
} |
&make_persistent({ query => $query, |
&make_persistent({ query => $query, |
Line 406 END
|
Line 343 END
|
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
## |
|
## Course Search |
|
## |
|
###################################################################### |
|
###################################################################### |
|
{ # Scope the course search to avoid global variables |
|
# |
|
# Variables For course search |
|
my %alreadyseen; |
|
my %hash; |
|
my $totalfound; |
|
|
sub course_search { |
sub course_search { |
my $r=shift; |
my $r=shift; |
Line 428 sub course_search {
|
Line 376 sub course_search {
|
$bodytag.$pretty_search_string); |
$bodytag.$pretty_search_string); |
$r->rflush(); |
$r->rflush(); |
# ======================================================= Go through the course |
# ======================================================= Go through the course |
$hashtied=0; |
undef %alreadyseen; |
undef %alreadyseen; |
%alreadyseen=(); |
%alreadyseen=(); |
|
my $c=$r->connection; |
my $c=$r->connection; |
&tiehash(); |
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", |
foreach (keys %hash) { |
&GDBM_READER(),0640)) { |
if ($c->aborted()) { last; } |
foreach (keys %hash) { |
if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { |
if ($c->aborted()) { last; } |
&checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,@allwords); |
if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { |
} |
&checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext, |
} |
@allwords); |
&untiehash(); |
} |
|
} |
|
untie(%hash); |
|
} |
unless ($totalfound) { |
unless ($totalfound) { |
$r->print('<p>'.&mt('No resources found').'.</p>'); |
$r->print('<p>'.&mt('No resources found').'.</p>'); |
} |
} |
Line 447 sub course_search {
|
Line 397 sub course_search {
|
$r->print('</body></html>'); |
$r->print('</body></html>'); |
} |
} |
|
|
# ---------------------------------------------------------------- tie the hash |
|
|
|
sub tiehash { |
|
$hashtied=0; |
|
if ($ENV{'request.course.fn'}) { |
|
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", |
|
&GDBM_READER(),0640)) { |
|
$hashtied=1; |
|
} |
|
} |
|
} |
|
|
|
sub untiehash { |
|
if ($hashtied) { untie %hash; } |
|
$hashtied=0; |
|
} |
|
|
|
# =============================== This pulls up a resource and its dependencies |
# =============================== This pulls up a resource and its dependencies |
|
|
sub checkonthis { |
sub checkonthis { |
Line 509 sub checkonthis {
|
Line 442 sub checkonthis {
|
} |
} |
} |
} |
|
|
|
sub untiehash { |
|
if (tied(%hash)) { |
|
untie(%hash); |
|
} |
|
} |
|
|
|
} # End of course search scoping |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
|
Line 524 Returns a scalar which holds html for th
|
Line 465 Returns a scalar which holds html for th
|
###################################################################### |
###################################################################### |
|
|
sub print_basic_search_form{ |
sub print_basic_search_form{ |
my ($r,$closebutton) = @_; |
my ($r,$closebutton,$hidden_fields) = @_; |
my $bodytag=&Apache::loncommon::bodytag('Search'); |
my $bodytag=&Apache::loncommon::bodytag('Search'); |
my $scrout=<<"ENDDOCUMENT"; |
my $scrout=<<"ENDDOCUMENT"; |
<html> |
<html> |
Line 541 sub print_basic_search_form{
|
Line 482 sub print_basic_search_form{
|
$bodytag |
$bodytag |
ENDDOCUMENT |
ENDDOCUMENT |
if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) { |
if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) { |
|
my $CatalogSearch=&mt('Catalog Search'); |
|
my $Statement=&mt('Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below'); |
$scrout.=(<<ENDDOCUMENT); |
$scrout.=(<<ENDDOCUMENT); |
<h1>Catalog Search</h1> |
<h1>$CatalogSearch</h1> |
<form method="post" action="/adm/searchcat"> |
<form name="loncapa_search" method="post" action="/adm/searchcat"> |
<input type="hidden" name="phase" value="basic_search" /> |
<input type="hidden" name="phase" value="basic_search" /> |
$hidden_fields |
$hidden_fields |
<p> |
<p> |
Enter terms or phrases separated by AND, OR, or NOT |
$Statement. |
then press SEARCH below. |
|
</p> |
</p> |
<p> |
<p> |
<table> |
<table> |
Line 556 then press SEARCH below.
|
Line 498 then press SEARCH below.
|
ENDDOCUMENT |
ENDDOCUMENT |
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40). |
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40). |
' '; |
' '; |
my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'}); |
my $relatedcheckbox = &simplecheckbox('related','related',$ENV{'form.related'}); |
my $domain = $r->dir_config('lonDefDomain'); |
my $domain = $r->dir_config('lonDefDomain'); |
my $domaincheckbox = &simplecheckbox('domains',$domain); |
my $domaincheckbox = &simplecheckbox('domains',$domain); |
my $srch=&mt('Search'); |
my $srch=&mt('Search'); |
my $header=&mt('Advanced Search'); |
my $header=&mt('Advanced Search'); |
|
my $userelatedwords=&mt('use related words'); |
|
my $onlysearchdomain=&mt('only search domain'); |
$scrout.=<<END; |
$scrout.=<<END; |
</td><td><a |
</td><td><a |
href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}" |
href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}" |
>$header</a></td></tr> |
>$header</a></td></tr> |
<tr><td>$relatedcheckbox use related words</td> |
<tr><td>$relatedcheckbox $userelatedwords</td> |
<td>$domaincheckbox only search domain <b>$domain</b></td></tr> |
<td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr> |
</table> |
</table> |
</p> |
</p> |
<p> |
<p> |
Line 595 ENDDOCUMENT
|
Line 539 ENDDOCUMENT
|
$scrout.=(<<ENDCOURSESEARCH); |
$scrout.=(<<ENDCOURSESEARCH); |
<hr /> |
<hr /> |
<h1>$lt{'header'}</h1> |
<h1>$lt{'header'}</h1> |
<form method="post" action="/adm/searchcat"> |
<form name="course_search" method="post" action="/adm/searchcat"> |
<input type="hidden" name="phase" value="course_search" /> |
<input type="hidden" name="phase" value="course_search" /> |
$hidden_fields |
$hidden_fields |
<p> |
<p> |
Line 642 Returns a scalar which holds html for th
|
Line 586 Returns a scalar which holds html for th
|
###################################################################### |
###################################################################### |
|
|
sub print_advanced_search_form{ |
sub print_advanced_search_form{ |
my ($r,$closebutton) = @_; |
my ($r,$closebutton,$hidden_fields) = @_; |
my $advanced_buttons = <<"END"; |
my $advanced_buttons = <<"END"; |
<p> |
<p> |
<input type="submit" name="advancedsubmit" value='SEARCH' /> |
<input type="submit" name="advancedsubmit" value='SEARCH' /> |
Line 1029 sub simpletextfield {
|
Line 973 sub simpletextfield {
|
|
|
=item &simplecheckbox() |
=item &simplecheckbox() |
|
|
Inputs: $name,$value |
Inputs: $name,$value,$checked |
|
|
Returns a simple check box with the given $name. |
Returns a simple check box with the given $name. |
If $value eq 'on' the box is checked. |
If $value eq 'on' the box is checked. |
Line 1041 If $value eq 'on' the box is checked.
|
Line 985 If $value eq 'on' the box is checked.
|
|
|
sub simplecheckbox{ |
sub simplecheckbox{ |
my ($name,$value,$checked)=@_; |
my ($name,$value,$checked)=@_; |
$checked="checked" if ($value eq 'on'); |
$checked="checked" if ($value eq $checked || $value eq 'on'); |
return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '. |
return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '. |
$checked.' />'; |
$checked.' />'; |
} |
} |
Line 1294 Parse advanced search form and return th
|
Line 1238 Parse advanced search form and return th
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub parse_advanced_search { |
sub parse_advanced_search { |
my ($r,$closebutton)=@_; |
my ($r,$closebutton,$hidden_fields)=@_; |
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 1328 sub parse_advanced_search {
|
Line 1272 sub parse_advanced_search {
|
} |
} |
} |
} |
unless ($fillflag) { |
unless ($fillflag) { |
&output_blank_field_error($r,$closebutton,'phase=disp_adv'); |
&output_blank_field_error($r,$closebutton,'phase=disp_adv',$hidden_fields); |
return ; |
return ; |
} |
} |
# Turn the form input into a SQL-based query |
# Turn the form input into a SQL-based query |
Line 1411 sub parse_advanced_search {
|
Line 1355 sub parse_advanced_search {
|
); |
); |
# Test to see if date windows are legitimate |
# Test to see if date windows are legitimate |
if ($datequery=~/^Incorrect/) { |
if ($datequery=~/^Incorrect/) { |
&output_date_error($r,$datequery,$closebutton); |
&output_date_error($r,$datequery,$closebutton,$hidden_fields); |
return ; |
return ; |
} elsif ($datequery) { |
} elsif ($datequery) { |
# Here is where you would set up pretty_search_string to output |
# Here is where you would set up pretty_search_string to output |
Line 1846 sub ensure_db_and_table {
|
Line 1790 sub ensure_db_and_table {
|
###################################################################### |
###################################################################### |
sub print_sort_form { |
sub print_sort_form { |
my ($r,$pretty_query_string) = @_; |
my ($r,$pretty_query_string) = @_; |
|
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
## |
## |
my %SortableFields=&Apache::lonlocal::texthash( |
my %SortableFields=&Apache::lonlocal::texthash( |
id => 'Default', |
id => 'Default', |
Line 2091 sub revise_button {
|
Line 2036 sub revise_button {
|
###################################################################### |
###################################################################### |
sub run_search { |
sub run_search { |
my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_; |
my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_; |
|
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
my $connection = $r->connection; |
my $connection = $r->connection; |
# |
# |
# Timing variables |
# Timing variables |
Line 2341 sub prev_next_buttons {
|
Line 2287 sub prev_next_buttons {
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub display_results { |
sub display_results { |
my ($r,$importbutton,$closebutton) = @_; |
my ($r,$importbutton,$closebutton,$diropendb) = @_; |
my $connection = $r->connection; |
my $connection = $r->connection; |
$r->print(&search_results_header($importbutton,$closebutton)); |
$r->print(&search_results_header($importbutton,$closebutton)); |
## |
## |
Line 2688 Checked for existance & 'edit' mode.
|
Line 2634 Checked for existance & 'edit' mode.
|
|
|
=item 'form.form' |
=item 'form.form' |
|
|
|
Contains the name of the form that has the input fields to set |
|
|
=item 'form.element' |
=item 'form.element' |
|
|
|
the name of the input field to put the URL into |
|
|
|
=item 'form.titleelement' |
|
|
|
the name of the input field to put the title into |
|
|
=back |
=back |
|
|
=cut |
=cut |
Line 2698 Checked for existance & 'edit' mode.
|
Line 2652 Checked for existance & 'edit' mode.
|
###################################################################### |
###################################################################### |
sub search_results_header { |
sub search_results_header { |
my ($importbutton,$closebutton) = @_; |
my ($importbutton,$closebutton) = @_; |
|
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
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 2726 SCRIPT
|
Line 2681 SCRIPT
|
} elsif ($ENV{'form.mode'} eq 'edit') { |
} elsif ($ENV{'form.mode'} eq 'edit') { |
my $form = $ENV{'form.form'}; |
my $form = $ENV{'form.form'}; |
my $element = $ENV{'form.element'}; |
my $element = $ENV{'form.element'}; |
|
my $titleelement = $ENV{'form.titleelement'}; |
|
my $changetitle; |
|
if (!$titleelement) { |
|
$changetitle='function changeTitle(val) {}'; |
|
} else { |
|
$changetitle=<<END; |
|
function changeTitle(val) { |
|
if (parent.targetwin.document) { |
|
parent.targetwin.document.forms["$form"].elements["$titleelement"].value=val; |
|
} else { |
|
var url = 'forms[\"$form\"].elements[\"$titleelement\"].value'; |
|
alert("Unable to transfer data to "+url); |
|
} |
|
} |
|
END |
|
} |
|
|
$result.=<<SCRIPT; |
$result.=<<SCRIPT; |
<script type="text/javascript"> |
<script type="text/javascript"> |
function select_data(title,url) { |
function select_data(title,url) { |
changeURL(url); |
changeURL(url); |
|
changeTitle(title); |
parent.close(); |
parent.close(); |
} |
} |
function changeTitle(val) { |
$changetitle |
} |
|
function changeURL(val) { |
function changeURL(val) { |
if (parent.targetwin.document) { |
if (parent.targetwin.document) { |
parent.targetwin.document.forms["$form"].elements["$element"].value=val; |
parent.targetwin.document.forms["$form"].elements["$element"].value=val; |
Line 2784 END
|
Line 2756 END
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub search_status_header { |
sub search_status_header { |
|
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
return <<ENDSTATUS; |
return <<ENDSTATUS; |
<html><head><title>Search Status</title></head> |
<html><head><title>Search Status</title></head> |
$bodytag |
$bodytag |
Line 2851 extra custom metadata to show.
|
Line 2824 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 $result=<<END; |
my $result=<<END; |
<b>$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
<b>$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
target='search_preview'>$values{'title'}</a></b> |
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 2885 END
|
Line 2859 END
|
###################################################################### |
###################################################################### |
sub summary_view { |
sub summary_view { |
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
|
my $icon=&Apache::loncommon::icon($values{'url'}); |
my $result=<<END; |
my $result=<<END; |
$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
$prefix<img src="$icon" /><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 /> |
Line 2911 END
|
Line 2886 END
|
###################################################################### |
###################################################################### |
sub compact_view { |
sub compact_view { |
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
|
my $icon=&Apache::loncommon::icon($values{'url'}); |
my $result=<<END; |
my $result=<<END; |
$prefix <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'> |
$prefix <img src="$icon" /> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'> |
$values{'title'}</a> |
$values{'title'}</a> |
<b>$values{'author'}</b><br /> |
<b>$values{'author'}</b><br /> |
END |
END |
Line 2933 END
|
Line 2909 END
|
###################################################################### |
###################################################################### |
sub fielded_format_view { |
sub fielded_format_view { |
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
|
my $icon=&Apache::loncommon::icon($values{'url'}); |
my $result=<<END; |
my $result=<<END; |
$prefix |
$prefix <img src="$icon" /> |
<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 3050 $parms is extra information to include i
|
Line 3027 $parms is extra information to include i
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub output_blank_field_error { |
sub output_blank_field_error { |
my ($r,$closebutton,$parms)=@_; |
my ($r,$closebutton,$parms,$hidden_fields)=@_; |
|
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
# 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 3099 Inputs:
|
Line 3077 Inputs:
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub output_date_error { |
sub output_date_error { |
my ($r,$message,$closebutton)=@_; |
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); |
$r->print(<<RESULTS); |
$r->print(<<RESULTS); |
<html> |
<html> |
<head> |
<head> |
Line 3154 sub start_fresh_session {
|
Line 3133 sub start_fresh_session {
|
|
|
sub cleanup { |
sub cleanup { |
if (tied(%groupsearch_db)) { |
if (tied(%groupsearch_db)) { |
&Apache::lonnet::logthis('Cleanup searchcat: groupsearch_db'); |
|
unless (untie(%groupsearch_db)) { |
unless (untie(%groupsearch_db)) { |
&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db'); |
&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db'); |
} |
} |