loncom/interface/lonsearchcat.pm - diff

Return to lonsearchcat.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.291 and 1.352

version 1.291, 2008/02/14 18:04:09	version 1.352, 2017/08/10 22:49:01
Line 52 search (on a server basis) is displayed	Line 52 search (on a server basis) is displayed

=head1 Internals	=head1 Internals

=over 4

=cut	=cut

###############################################################################	###############################################################################
Line 78 use HTML::Entities();	Line 76 use HTML::Entities();
use Parse::RecDescent;	use Parse::RecDescent;
use Apache::lonnavmaps;	use Apache::lonnavmaps;
use Apache::lonindexer();	use Apache::lonindexer();
	use Apache::lonwishlist();
use LONCAPA;	use LONCAPA;
	use Time::HiRes qw(sleep);

######################################################################	######################################################################
######################################################################	######################################################################
Line 118 sub handler {	Line 118 sub handler {
# This is set and used in &handler() and is also used in	# This is set and used in &handler() and is also used in
# &output_results().	# &output_results().

my $loaderror=&Apache::lonnet::overloaderror($r);
if ($loaderror) { return $loaderror; }
#	#
my $closebutton; # button that closes the search window	my $closebutton; # button that closes the search window
# This button is different for the RAT compared to	# This button is different for the RAT compared to
Line 146 sub handler {	Line 144 sub handler {
## this once, so the pause indicator is deleted	## this once, so the pause indicator is deleted
##	##
if (exists($env{'form.pause'})) {	if (exists($env{'form.pause'})) {
sleep(1);	sleep(0.1);
delete($env{'form.pause'});	delete($env{'form.pause'});
}	}
##	##
## Initialize global variables	## Initialize global variables
##	##
my $domain = $r->dir_config('lonDefDomain');	my $domain = $r->dir_config('lonDefDomain');
$diropendb= "/home/httpd/perl/tmp/".	my $temp_file_dir = LONCAPA::tempdir();
	$diropendb= $temp_file_dir .
"$env{'user.domain'}_$env{'user.name'}_sel_res.db";	"$env{'user.domain'}_$env{'user.name'}_sel_res.db";
#	#
# set the name of the persistent database	# set the name of the persistent database
Line 164 sub handler {	Line 163 sub handler {
$env{'form.persistent_db_id'} = time;	$env{'form.persistent_db_id'} = time;
}	}

my $persistent_db_file = "/home/httpd/perl/tmp/".	my $persistent_db_file = $temp_file_dir .
&escape($domain).	&escape($domain).
'_'.&escape($env{'user.name'}).	'_'.&escape($env{'user.name'}).
'_'.$env{'form.persistent_db_id'}.'_persistent_search.db';	'_'.$env{'form.persistent_db_id'}.'_persistent_search.db';
Line 172 sub handler {	Line 171 sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();

my @allowed_searches = ('portfolio');	my @allowed_searches = ('portfolio');
if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
push(@allowed_searches,'res');	push(@allowed_searches,'res');
}	}
if (exists($env{'request.course.id'}) && $env{'request.course.id'} ne '') {
push(@allowed_searches,'course');
}
my $crumb_text = 'Portfolio Search';	my $crumb_text = 'Portfolio Search';
if (@allowed_searches == 3) {	if (@allowed_searches ==2) {
$crumb_text = 'Course, Portfolio and Catalog Search';	$crumb_text = 'Portfolio and Catalog Search';
} elsif (@allowed_searches ==2) {
if (grep(/^res$/,@allowed_searches)) {
$crumb_text = 'Portfolio and Catalog Search';
} elsif (grep(/^course$/,@allowed_searches)) {
$crumb_text = 'Portfolio and Course Search';
}
}	}
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/searchcat?'.	({href=>'/adm/searchcat?'.
&Apache::loncommon::inhibit_menu_check().	&Apache::loncommon::inhibit_menu_check().
'&catalogmode='.$env{'form.catalogmode'}.	'&catalogmode='.$env{'form.catalogmode'}.
'&launch='.$env{'form.launch'}.	'&launch='.$env{'form.launch'}.
'&mode='.$env{'form.mode'},	'&mode='.$env{'form.mode'},
text=>"$crumb_text",	text=>"$crumb_text",
target=>'_top',	target=>'_top',
bug=>'Searching',});	bug=>'Searching',});
Line 204 sub handler {	Line 194 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);
my $msg =	my $msg =
'We were unable to retrieve data describing your search. '.	&mt('We were unable to retrieve data describing your search.').
'This is a serious error and has been logged. '.	' '.&mt('This is a serious error and has been logged.').
'Please alert your LON-CAPA administrator.';	'<br />'.
&Apache::loncommon::simple_error_page($r,'Search Error',	&mt('Please alert your LON-CAPA administrator.');
$msg);	&Apache::loncommon::simple_error_page(
	$r,'Search Error',
	$msg,
	{'no_auto_mt_msg' => 1});
return OK;	return OK;
}	}
}	}
Line 266 sub handler {	Line 259 sub handler {
## Configure dynamic components of interface	## Configure dynamic components of interface
##	##
if ($env{'form.catalogmode'} eq 'interactive') {	if ($env{'form.catalogmode'} eq 'interactive') {
$closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";	$closebutton="<input type='button' name='close' value='".&mt('Close')."' ";
if ($env{'form.phase'} =~ /(results\|run_search)/) {	if ($env{'form.phase'} =~ /(results\|run_search)/) {
$closebutton .="onClick='parent.close()'";	$closebutton .="onclick='parent.close()'";
} else {	} else {
$closebutton .="onClick='self.close()'";	$closebutton .="onclick='self.close()'";
}	}
$closebutton .=">\n";	$closebutton .=" />\n";
} elsif ($env{'form.catalogmode'} eq 'import') {	} elsif ($env{'form.catalogmode'} eq 'import') {
$closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";	$closebutton="<input type='button' name='close' value='".&mt('Close')."' ";
if ($env{'form.phase'} =~ /(results\|run_search)/) {	if ($env{'form.phase'} =~ /(results\|run_search)/) {
$closebutton .="onClick='parent.close()'";	$closebutton .="onclick='parent.close()'";
} else {	} else {
$closebutton .="onClick='self.close()'";	$closebutton .="onclick='self.close()'";
}	}
$closebutton .= ">";	$closebutton .= " />";
	my $txt_import = &mt('IMPORT');
$importbutton=<<END;	$importbutton=<<END;
<input type='button' name='import' value='IMPORT'	<input type='button' name='import' value='$txt_import'
onClick='javascript:select_group()'>	onclick='javascript:select_group()' />
END	END
} else {	} else {
$closebutton = '';	$closebutton = '';
Line 302 END	Line 296 END
if ($env{'form.phase'} eq 'adv_search' \|\|	if ($env{'form.phase'} eq 'adv_search' \|\|
$env{'form.phase'} eq 'disp_adv') {	$env{'form.phase'} eq 'disp_adv') {
$env{'form.searchmode'} = 'advanced';	$env{'form.searchmode'} = 'advanced';
} elsif ($env{'form.phase'} eq 'course_search') {
$env{'form.searchmode'} = 'course_search';
}	}
#	#
if ($env{'form.searchmode'} eq 'advanced') {	if ($env{'form.searchmode'} eq 'advanced') {
Line 313 END	Line 305 END
}	}
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().	({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
'&phase=disp_adv'.	'&phase=disp_adv'.
'&catalogmode='.$env{'form.catalogmode'}.	'&catalogmode='.$env{'form.catalogmode'}.
'&launch='.$env{'form.launch'}.	'&launch='.$env{'form.launch'}.
'&mode='.$env{'form.mode'},	'&mode='.$env{'form.mode'},
text=>"Advanced $srchtype Search",	text=>"Advanced $srchtype Search",
bug=>'Searching',});	bug=>'Searching',});
} elsif ($env{'form.searchmode'} eq 'course search') {	}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
'&phase=disp_adv'.
'catalogmode='.$env{'form.catalogmode'}.
'&launch='.$env{'form.launch'}.
'&mode='.$env{'form.mode'},
text=>"Course Search",
bug=>'Searching',});
}
##	##
## Switch on the phase	## Switch on the phase
##	##
Line 340 END	Line 323 END
&display_results($r,$importbutton,$closebutton,$diropendb,	&display_results($r,$importbutton,$closebutton,$diropendb,
$env{'form.area'});	$env{'form.area'});
} 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,$domainsref) =
&get_persistent_data($persistent_db_file,	&get_persistent_data($persistent_db_file,
['query','customquery','customshow',	['query','customquery','customshow',
'libraries','pretty_string']);	'libraries','pretty_string','domains']);
if ($env{'form.phase'} eq 'sort') {	if ($env{'form.phase'} eq 'sort') {
&print_sort_form($r,$pretty_string);	&print_sort_form($r,$pretty_string);
} elsif ($env{'form.phase'} eq 'run_search') {	} elsif ($env{'form.phase'} eq 'run_search') {
&run_search($r,$query,$customquery,$customshow,	&run_search($r,$query,$customquery,$customshow,
$libraries,$pretty_string,$env{'form.area'});	$libraries,$pretty_string,$env{'form.area'},$domainsref);
}	}
} elsif ($env{'form.phase'} eq 'course_search') {
&course_search($r);
} 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')) {
#	#
# We are running a search, try to parse it	# We are running a search, try to parse it
my ($query,$customquery,$customshow,$libraries) =	my ($query,$customquery,$customshow,$libraries,$domains) =
(undef,undef,undef,undef);	(undef,undef,undef,undef,undef);
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,$domains) =
&parse_basic_search($r,$closebutton,$hidden_fields);	&parse_basic_search($r,$closebutton,$hidden_fields);
return OK if (! defined($query));	return OK if (! defined($query));
&make_persistent({ basicexp => $env{'form.basicexp'}},	&make_persistent({ basicexp => $env{'form.basicexp'}},
$persistent_db_file);	$persistent_db_file);
} else { # Advanced search	} else { # Advanced search
($query,$customquery,$customshow,$libraries,$pretty_string)	($query,$customquery,$customshow,$libraries,$pretty_string,$domains)
= &parse_advanced_search($r,$closebutton,$hidden_fields);	= &parse_advanced_search($r,$closebutton,$hidden_fields);
return OK if (! defined($query));	return OK if (! defined($query));
}	}
Line 374 END	Line 355 END
customquery => $customquery,	customquery => $customquery,
customshow => $customshow,	customshow => $customshow,
libraries => $libraries,	libraries => $libraries,
pretty_string => $pretty_string },	pretty_string => $pretty_string,
	domains => $domains },
$persistent_db_file);	$persistent_db_file);
#	#
# Set up table	# Set up table
Line 447 sub hidden_field {	Line 429 sub hidden_field {
}	}

######################################################################	######################################################################
######################################################################
##
## Course Search
##
######################################################################
######################################################################
{ # Scope the course search to avoid global variables
#
# Variables For course search
my %alreadyseen;
my %hash;
my $totalfound;

sub make_symb {
my ($id)=@_;
my ($mapid,$resid)=split(/\./,$id);
my $map=$hash{'map_id_'.$mapid};
my $res=$hash{'src_'.$id};
my $symb=&Apache::lonnet::encode_symb($map,$resid,$res);
return $symb;
}

sub course_search {
my $r=shift;
my $pretty_search_string = '<b>'.$env{'form.courseexp'}.'</b>';
my $search_string = $env{'form.courseexp'};
my @New_Words;
undef(%alreadyseen);
if ($env{'form.crsrelated'}) {
($search_string,@New_Words) = &related_version($env{'form.courseexp'});
if (@New_Words) {
$pretty_search_string .= ' '.&mt("with related words").": <b>@New_Words</b>.";
} else {
$pretty_search_string .= ' '.&mt('with no related words').".";
}
}
my $fulltext=$env{'form.crsfulltext'};
my $discuss=$env{'form.crsdiscuss'};
my @allwords=($search_string,@New_Words);
$totalfound=0;
$r->print(&Apache::loncommon::start_page('Course Search').
'<hr /><center><font size="+2" face="arial">'.
$pretty_search_string.'</font></center>'.
'<hr /><b>'.&mt('Course content').':</b><br />');
$r->rflush();
# ======================================================= Go through the course
my $c=$r->connection;
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db",
&GDBM_READER(),0640)) {
foreach (sort(keys(%hash))) {
if ($c->aborted()) { last; }
if (($_=~/^src\_(.+)$/)) {
if ($hash{'randomout_'.$1} & !$env{'request.role.adv'}) {
next;
}
my $symb=&make_symb($1);
&checkonthis($r,$1,$hash{$_},0,&Apache::lonnet::gettitle($symb),
$fulltext,$symb,@allwords);
}
}
untie(%hash);
}
unless ($totalfound) {
$r->print('<p>'.&mt('No matches found in resources').'.</p>');
}

# Check discussions if requested
if ($discuss) {
my $totaldiscussions = 0;
$r->print('<br /><br /><b>'.&mt('Discussion postings').':</b><br />');
my $navmap = Apache::lonnavmaps::navmap->new();
my @allres=$navmap->retrieveResources();
my %discussiontime = &Apache::lonnet::dump('discussiontimes',
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
foreach my $resource (@allres) {
my $result = '';
my $applies = 0;
my $symb = $resource->symb();
my $ressymb = $symb;
if ($symb =~ m#(___adm/$LONCAPA::domain_re/$LONCAPA::username_re)/(\d+)/bulletinboard$#) {
$ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
$ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
}
}
if (defined($discussiontime{$ressymb})) {
my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
if ($contrib{'version'}) {
for (my $id=1;$id<=$contrib{'version'};$id++) {
unless (($contrib{'hidden'}=~/\.$id\./) \|\| ($contrib{'deleted'}=~/\.$id\./)) {
if ($contrib{$id.':subject'}) {
$result .= $contrib{$id.':subject'};
}
if ($contrib{$id.':message'}) {
$result .= $contrib{$id.':message'};
}
if ($contrib{$id,':attachmenturl'}) {
if ($contrib{$id,':attachmenturl'} =~ m-/([^/]+)$-) {
$result .= $1;
}
}
$applies = &checkwords($result,$applies,@allwords);
}
}
}
}
# Does this discussion apply?
if ($applies) {
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ressymb);
my $disctype = &mt('resource');
if ($url =~ m#/bulletinboard$#) {
if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
$url =~s#^adm/wrapper##;
}
$disctype = &mt('bulletin board');
} else {
$url = '/res/'.$url;
}
if ($url =~ /\?/) {
$url .= '&symb=';
} else {
$url .= '?symb=';
}
$url .= &escape($resource->symb());
my $title = $resource->compTitle();
$r->print('<br /><a href="'.$url.'" target="cat">'.
($title?$title:$url).'</a>  - '.$disctype.'<br />');
$totaldiscussions++;
} else {
$r->print(' .');
}
}
unless ($totaldiscussions) {
$r->print('<p>'.&mt('No matches found in postings').'.</p>');
}
}

# =================================================== Done going through course
$r->print(&Apache::loncommon::end_page());
}

# =============================== This pulls up a resource and its dependencies

sub checkonthis {
my ($r,$id,$url,$level,$title,$fulltext,$symb,@allwords)=@_;
$alreadyseen{$id}=1;
if (&Apache::loncommon::connection_aborted($r)) { return; }
$r->rflush();

my $result=$title.' ';
if ($env{'request.role.adv'} \|\| !$hash{'encrypted_'.$id}) {
$result.=&Apache::lonnet::metadata($url,'title').' '.
&Apache::lonnet::metadata($url,'subject').' '.
&Apache::lonnet::metadata($url,'abstract').' '.
&Apache::lonnet::metadata($url,'keywords');
}
my ($extension)=($url=~/\.(\w+)$/);
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' &&
($url) && ($fulltext)) {
$result.=&Apache::lonnet::ssi_body($url.'?symb='.&escape($symb));
}
$result=~s/\s+/ /gs;
my $applies = 0;
$applies = &checkwords($result,$applies,@allwords);
# Does this resource apply?
if ($applies) {
$r->print('<br />');
for (my $i=0;$i<=$level*5;$i++) {
$r->print(' ');
}
my $href=$url;
if ($hash{'encrypted_'.$id} && !$env{'request.role.adv'}) {
$href=&Apache::lonenc::encrypted($href)
.'?symb='.&Apache::lonenc::encrypted($symb);
} else {
$href.='?symb='.&escape($symb);
}
$r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url).
'</a><br />');
$totalfound++;
} elsif ($fulltext) {
$r->print(' .');
}
$r->rflush();
# Check also the dependencies of this one
my $dependencies=
&Apache::lonnet::metadata($url,'dependencies');
foreach (split(/\,/,$dependencies)) {
if (($_=~/^\/res\//) && (!$alreadyseen{$id})) {
&checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords);
}
}
}

sub checkwords {
my ($result,$applies,@allwords) = @_;
foreach (@allwords) {
if ($_=~/\w/) {
if ($result=~/$_/si) {
$applies++;
}
}
}
return $applies;
}

sub untiehash {
if (tied(%hash)) {
untie(%hash);
}
}

} # End of course search scoping


######################################################################
######################################################################

=pod	=pod

	=over 4

=item &print_basic_search_form()	=item &print_basic_search_form()

Prints the form for the basic search. Sorry the name is so cryptic.	Prints the form for the basic search. Sorry the name is so cryptic.
Line 684 sub print_basic_search_form {	Line 448 sub print_basic_search_form {
my $bread_crumb =	my $bread_crumb =
&Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',	&Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
$env{'form.catalogmode'} ne 'import');	$env{'form.catalogmode'} ne 'import');
my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;	my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
# Search form for resource space	# Search form for resource space
if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
$scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);	$scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
$scrout .= '<hr /><br />';	$scrout .= '<hr /><br />';
}	}
# Search form for accessible portfolio files	# Search form for accessible portfolio files
$scrout.= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);	$scrout.= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
if ($env{'request.course.id'}) {
my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
'header' => 'Course Search',
'note' => 'Enter terms or phrases, then press "Search" below',
'use' => 'use related words',
'full' =>'fulltext search (time consuming)',
'disc' => 'search discussion postings (resources and bulletin boards)',
);
$scrout.=(<<ENDCOURSESEARCH);
<form name="loncapa_search" method="post" action="/adm/searchcat">
<center>
<hr />
<h1>$lt{'header'}</h1>
<input type="hidden" name="phase" value="course_search" />
$hidden_fields
<p>
$lt{'note'}.
</p>
<p>
<table>
<tr><td>
ENDCOURSESEARCH
$scrout.=' '.
&Apache::lonhtmlcommon::textbox('courseexp',
$env{'form.courseexp'},40);
my $crscheckbox =
&Apache::lonhtmlcommon::checkbox('crsfulltext',
$env{'form.crsfulltext'});
my $relcheckbox =
&Apache::lonhtmlcommon::checkbox('crsrelated',
$env{'form.crsrelated'});
my $discheckbox =
&Apache::lonhtmlcommon::checkbox('crsdiscuss',
$env{'form.crsrelated'});
$scrout.=(<<ENDENDCOURSE);
</td></tr>
<tr><td><label>$relcheckbox $lt{'use'}</label></td><td></td></tr>
<tr><td><label>$crscheckbox $lt{'full'}</label></td><td></td></tr>
<tr><td><label>$discheckbox $lt{'disc'}</label></td><td></td></tr>
</table><p>
<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
</p>
</center>
</form>
ENDENDCOURSE
}
$scrout .= &Apache::loncommon::end_page();	$scrout .= &Apache::loncommon::end_page();
$r->print($scrout);	$r->print($scrout);
return;	return;
Line 751 sub setup_basic_search {	Line 469 sub setup_basic_search {
portfolio => 'Portfolio Search',	portfolio => 'Portfolio Search',
);	);
my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);	my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
$userelatedwords = '<label>'.&mt('[_1] use related words',
&Apache::lonhtmlcommon::checkbox('related',$env{'form.related'},'related')).	$userelatedwords = '<label>'
'</label>';	.&Apache::lonhtmlcommon::checkbox(
$onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',	'related',
&Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},	$env{'form.related'},
$r->dir_config('lonDefDomain')),	'related')
$r->dir_config('lonDefDomain')).	.' '
'</label>';	.&mt('use related words')
	.'</label>';

	my $anydom = 1;
if ($area eq 'res') {	if ($area eq 'res') {
$inclext= '<label>'.&mt('[_1] include external resources',	unless (&Apache::lonnet::allowed('bre','/res/') eq 'F') {
&Apache::lonhtmlcommon::checkbox('inclext',$env{'form.inclext'})).	$anydom = 0;
'</label>';	}
}	}
	my $singledom;
	my ($disabled,$checked);
	if ($anydom) {
	$singledom = $r->dir_config('lonDefDomain');
	if ($env{'form.domains'} eq $singledom) {
	$checked = 1;
	}
	} else {
	$singledom = $env{'user.domain'};
	$disabled = ' disabled="disabled"';
	$checked = 1;
	}
	$onlysearchdomain = '<label>'
	.&Apache::lonhtmlcommon::checkbox(
	'domains',$checked,
	$singledom,$disabled)
	.' '
	.&mt('only search domain [_1]'
	,'<b>'.$singledom.'</b>')
	.'</label>';

$adv_search_link = '<a href="/adm/searchcat?'.	$adv_search_link = '<a href="/adm/searchcat?'.
&Apache::loncommon::inhibit_menu_check().	&Apache::loncommon::inhibit_menu_check().
'&phase=disp_adv'.	'&phase=disp_adv'.
'&catalogmode='.$env{'form.catalogmode'}.	'&catalogmode='.$env{'form.catalogmode'}.
'&launch='.$env{'form.launch'}.	'&launch='.$env{'form.launch'}.
'&mode='.$env{'form.mode'}.	'&mode='.$env{'form.mode'}.
'&area='.$area.	'&area='.$area.
'&form='.$env{'form.form'}.	'&form='.$env{'form.form'}.
'&titleelement='.$env{'form.titleelement'}.	'&titleelement='.$env{'form.titleelement'}.
'&element='.$env{'form.element'}.	'&element='.$env{'form.element'}.
'">'.&mt('Advanced Search').'</a>';	'">'.&mt('Advanced Search').'</a>';
#	#
$scrout.='<form name="loncapa_search" method="post" '.	$scrout.='<form name="loncapa_search" method="post" '.
Line 784 sub setup_basic_search {	Line 526 sub setup_basic_search {
$scrout .= '<input type="hidden" name="area" value="'.$area.'" />';	$scrout .= '<input type="hidden" name="area" value="'.$area.'" />';
}	}
#	#
$scrout .= '<center>'.$/;	$scrout .= '<div align="center">'.$/;
# if ($env{'request.course.id'}) {	# if ($env{'request.course.id'}) {
$scrout .= '<h1>'.$lt{$area}.'</h1>';	$scrout .= '<h1>'.$lt{$area}.'</h1>';
# } else {	# } else {
Line 796 sub setup_basic_search {	Line 538 sub setup_basic_search {
&Apache::lonhtmlcommon::textbox('basicexp',	&Apache::lonhtmlcommon::textbox('basicexp',
$env{'form.basicexp'},50).	$env{'form.basicexp'},50).
'<br />'.	'<br />'.
'<font size="-1">'.&searchhelp().'</font>'.'</td>'.	'<span class="LC_fontsize_small">'.&searchhelp().'</span>'.'</td>'.
'<td><font size="-1">'.	'<td>'.
'<nobr>'.(' 'x3).$adv_search_link.'</nobr>'.'<br />'.	'<span class="LC_nobreak">'.(' 'x3).$adv_search_link.'</span>'.'<br />'.
'<nobr>'.(' 'x1).$userelatedwords.'</nobr>'.'<br />'.	'<span class="LC_nobreak">'.(' 'x1).$userelatedwords.'</span>'.'<br />'.
'<nobr>'.(' 'x1).$onlysearchdomain.'</nobr>'.'<br />'.	'<span class="LC_nobreak">'.(' 'x1).$onlysearchdomain.'</span>'.'<br />'.
'<nobr>'.(' 'x1).$inclext.'</nobr>'.'<br />'.	'<span class="LC_nobreak">'.(' 'x1).$inclext.'</span>'.'<br />'.
'</font></td>'.	'</td>'.
'</tr>'.$/;	'</tr>'.
#	'</table>'.$/;
$scrout .= '<tr><td align="center" colspan="2">'.	#
'<font size="-1">'.	$scrout .= '<p>'
'<input type="submit" name="basicsubmit" '.	.&viewoptions()
'value="'.&mt('Search').'" />'.	.'</p>'
(' 'x2).$closebutton.(' 'x2). &viewoptions().	.'<p>'
'</font>'.	.'<input type="submit" name="basicsubmit" '
'</td></tr>'.$/;	.'value="'.&mt('Search').'" />'
$scrout .= '</table>'.$/.'</center>'.'</form>';	.' '
	.$closebutton
	.'</p>';
	#
	$scrout .= '</div>'.'</form>';
return $scrout;	return $scrout;
}	}

Line 838 sub print_advanced_search_form{	Line 584 sub print_advanced_search_form{
'reset' => 'Reset',	'reset' => 'Reset',
'help' => 'Help');	'help' => 'Help');
my $advanced_buttons=<<"END";	my $advanced_buttons=<<"END";
	<p>
<input type="submit" name="advancedsubmit" value='$lt{"srch"}' />	<input type="submit" name="advancedsubmit" value='$lt{"srch"}' />
<input type="reset" name="reset" value='$lt{"reset"}' />	<input type="reset" name="reset" value='$lt{"reset"}' />
$closebutton	$closebutton
	</p>
END	END
my $srchtype = 'Catalog';	my $srchtype = 'Catalog';
my $jscript;	my $jscript;
if ($env{'form.area'} eq 'portfolio') {	if ($env{'form.area'} eq 'portfolio') {
$srchtype = 'Portfolio';	$srchtype = 'Portfolio';
$jscript = '<script type="text/javascript">	$jscript = '<script type="text/javascript">
	// <![CDATA[
function additional_metadata() {	function additional_metadata() {
if (document.advsearch.newfield.checked) {	if (document.advsearch.newfield.checked) {
document.advsearch.phase.value = "disp_adv";	document.advsearch.phase.value = "disp_adv";
Line 854 function additional_metadata() {	Line 603 function additional_metadata() {
document.advsearch.submit();	document.advsearch.submit();
}	}
}	}
	// ]]>
</script>';	</script>';
}	}
my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",	my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
$jscript);	$jscript);
$scrout .= <<"ENDHEADER";	$scrout .= $bread_crumb;
$bread_crumb
<form method="post" action="/adm/searchcat" name="advsearch">	$scrout .= '<form method="post" action="/adm/searchcat" name="advsearch">'
<p>	.$hidden_fields
$advanced_buttons	.'<input type="hidden" name="phase" value="adv_search" />';
ENDHEADER
$scrout.=(' 'x2).&viewoptions().'</p>'.$hidden_fields.	$scrout .= '<fieldset>'."\n"
'<input type="hidden" name="phase" value="adv_search" />';	.'<legend>'.&mt('Display Options').'</legend>'."\n"
	.&viewoptions()
	.'</fieldset>';

	$scrout .= $advanced_buttons;

	$scrout .= &Apache::lonhtmlcommon::start_pick_box();

my %fields=&Apache::lonmeta::fieldnames();	my %fields=&Apache::lonmeta::fieldnames();
#
$scrout .= '<h3>'.&mt("Standard $srchtype Metadata").'</h3>';	# Standard Metadata
$scrout .= "<table>\n";	$scrout .= &Apache::lonhtmlcommon::row_headline()
$scrout .= '<tr><td> </td><td colspan="2"><font size="-1">'.	.'<h3>'.&mt("Standard $srchtype Metadata").'</h3>'
(' 'x2).&searchhelp()."</font></td></tr>\n";	.&searchhelp()
	.&Apache::lonhtmlcommon::row_closure();
my %related_word_search =	my %related_word_search =
('title' => 1,	('title' => 1,
'author' => 0,	'author' => 0,
Line 883 ENDHEADER	Line 641 ENDHEADER
'abstract' => 1,	'abstract' => 1,
'standards'=> 1,	'standards'=> 1,
'mime' => 1,	'mime' => 1,
'subject' => 1,	'subject' => 1,
);	);
#	#
foreach my $field ('title','author','subject','owner','authorspace',	foreach my $field ('title','author','subject','owner','authorspace',
'modifyinguser','keywords','notes','abstract',	'modifyinguser','keywords','notes','abstract',
'standards','mime') {	'standards','mime') {
$scrout.='<tr><td align="right">'.&titlefield($fields{$field}).'</td><td>'.	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
&Apache::lonmeta::prettyinput($field,	.&Apache::lonmeta::prettyinput($field,
$env{'form.'.$field},	$env{'form.'.$field},
$field,	$field,
'advsearch',	'advsearch',
$related_word_search{$field},	$related_word_search{$field},
'</td><td align="left">',	'',
$env{'form.'.$field.'_related'},	$env{'form.'.$field.'_related'},
50);	50);
if ($related_word_search{$field}) {	if ($related_word_search{$field}) {
$scrout .= &mt('related words');	$scrout .= &mt('related words');
} else {	} else {
$scrout .= '</td><td> ';	$scrout .= '';
}	}
$scrout .= '</td></tr>'.$/;	$scrout .= &Apache::lonhtmlcommon::row_closure();
}	}
foreach my $field ('lowestgradelevel','highestgradelevel') {	foreach my $field ('lowestgradelevel','highestgradelevel') {
$scrout.='<tr>'.	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
'<td align="right">'.&titlefield($fields{$field}).'</td>'.	.&Apache::lonmeta::prettyinput($field,
'<td colspan="2">'.
&Apache::lonmeta::prettyinput($field,
$env{'form.'.$field},	$env{'form.'.$field},
$field,	$field,
'advsearch',	'advsearch',
0).	0)
'</td></tr>'.$/;	.&Apache::lonhtmlcommon::row_closure();
}	}
$scrout.='<tr><td align="right">'.
&titlefield(&mt('MIME Type Category')).'</td><td colspan="2">'.	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('MIME Type Category')))
&Apache::loncommon::filecategoryselect('category',	.&Apache::loncommon::filecategoryselect('category',
$env{'form.category'}).	$env{'form.category'})
'</td></tr>'.$/;	.&Apache::lonhtmlcommon::row_closure();
$scrout.='<tr><td align="right" valign="top">'.
&titlefield(&mt('Domains')).'</td><td colspan="2">'.	my $anydomain = 1;
&Apache::loncommon::domain_select('domains',	if ($env{'form.area'} ne 'portfolio') {
$env{'form.domains'},1).	unless (&Apache::lonnet::allowed('bre','/res/')) {
'<br /><label>';	$anydomain = 0;
if ($env{'form.area'} ne 'portfolio') {	}
$scrout .= &mt('[_1] include external resources',	}
&Apache::lonhtmlcommon::checkbox
('inclext',$env{'form.inclext'})).'</label>'	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')));
}	if ($anydomain) {
$scrout .= '</td></tr>'.$/;	$scrout .= &Apache::loncommon::domain_select('domains',
#	$env{'form.domains'},1);
	} else {
	$scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'},
	'domains','','','',[$env{'user.domain'}],'',1);
	}
	$scrout .= &Apache::lonhtmlcommon::row_closure();

# Misc metadata	# Misc metadata
if ($env{'form.area'} ne 'portfolio') {	if ($env{'form.area'} ne 'portfolio') {
$scrout.='<tr><td align="right" valign="top">'.	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Copyright/Distribution')))
&titlefield(&mt('Copyright/Distribution')).	.&Apache::lonmeta::selectbox('copyright',
'</td><td colspan="2">'.
&Apache::lonmeta::selectbox('copyright',
$env{'form.copyright'},	$env{'form.copyright'},
\&Apache::loncommon::copyrightdescription,	\&Apache::loncommon::copyrightdescription,
( undef,	( undef,
&Apache::loncommon::copyrightids)	&Apache::loncommon::copyrightids)
).'</td></tr>'.$/;	)
	.&Apache::lonhtmlcommon::row_closure();
}	}
$scrout.='<tr><td align="right" valign="top">'.
&titlefield(&mt('Language')).'</td><td colspan="2">'.	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Language')))
&Apache::lonmeta::selectbox('language',	.&Apache::lonmeta::selectbox('language',
$env{'form.language'},	$env{'form.language'},
\&Apache::loncommon::languagedescription,	\&Apache::loncommon::languagedescription,
('any',&Apache::loncommon::languageids)	('any',&Apache::loncommon::languageids)
).'</td></tr>';	)
$scrout .= "</table>\n";	.&Apache::lonhtmlcommon::row_closure();


	# Portfolio Metadata
if ($env{'form.area'} eq 'portfolio') {	if ($env{'form.area'} eq 'portfolio') {
# Added fields	# Added fields
my $curnumadd = $env{'form.numaddedfields'};	my $curnumadd = $env{'form.numaddedfields'};
if ($curnumadd eq '') {	if ($curnumadd eq '') {
$curnumadd = 1;	$curnumadd = 1;
}	}
$scrout .= '<h3>'.&mt('Custom Metadata fields').'</h3>';	$scrout .= &Apache::lonhtmlcommon::row_headline()
$scrout .= "<table>\n";	.'<h3>'.&mt('Custom Metadata fields').'</h3>'
$scrout .= '<tr><td> </td><td align="center">'.	.&Apache::lonhtmlcommon::row_closure()
&mt('Field Name').'</td>'.'<td align="center">'.	.&Apache::lonhtmlcommon::row_title('')
&mt('Field Value(s)').'</td></tr>';	.&mt('Field Name').' \| '.&mt('Field Value(s)')
	.&Apache::lonhtmlcommon::row_closure();

for (my $j=0; $j<$curnumadd; $j++) {	for (my $j=0; $j<$curnumadd; $j++) {
my $num = $j+1;	my $num = $j+1;
$scrout .= '<tr><td>'.&mt('Custom metadata [_1]: ',$num).	$scrout .= &Apache::lonhtmlcommon::row_title(&mt('Custom metadata [_1]',$num))
'</td><td align="center">'.	.'<input type="text"'
'<input type="text" name="addedfield_'.$j.	.' name="addedfield_'.$j.'" size="10"'
'" size="10" value="'.$env{'form.addedfield_'.$j}.	.' value="'.$env{'form.addedfield_'.$j}.'" />'
'" /></td>'.	.' '
'<td align="center"><input type="text" '.	.'<input type="text" '
'name="addedvalues_'.$j.'" size="15" value="'.	.'name="addedvalues_'.$j.'" size="15"'
$env{'form.addedvalues_'.$j}.'" /></td></tr>';	.' value="'.$env{'form.addedvalues_'.$j}.'" />'
}	.&Apache::lonhtmlcommon::row_closure();
$scrout .= '<tr><td align="left" colspan="3"><label>'.	}
'<input type="checkbox" name="newfield" '.	$scrout .= &Apache::lonhtmlcommon::row_title('')
'value="1" onclick="javascript:additional_metadata()" />'.	.'<label>'
&mt('Another custom field/value pair?').'</label>'.	.'<input type="checkbox" name="newfield"'
'<input type="hidden" name="numaddedfields" value="'.	.' value="1" onclick="javascript:additional_metadata()" />'
$curnumadd.'" /></td></tr></table>';	.&mt('Another custom field/value pair?').'</label>'
} else {	.'<input type="hidden" name="numaddedfields"'
	.' value="'.$curnumadd.'" />'
	.&Apache::lonhtmlcommon::row_closure();
	} else {
#	#
# Dynamic metadata	# Dynamic metadata
$scrout .= '<h3>'.&mt('Problem Statistics').'</h3>';	$scrout .= &Apache::lonhtmlcommon::row_headline()
$scrout .= "<table>\n";	.'<h3>'.&mt('Problem Statistics').'</h3>'
$scrout .= '<tr><td> </td><td align="center">'.	.&Apache::lonhtmlcommon::row_closure();
&mt('Minimum').'</td>'.'<td align="center">'.	$scrout .= &Apache::lonhtmlcommon::row_title('')
&mt('Maximum').'</td></tr>'."\n";	.&mt('Minimum').' \| '.&mt('Maximum')
	.&Apache::lonhtmlcommon::row_closure();
foreach my $statistic	foreach my $statistic
({ name=>'count',	({ name=>'count',
description=>'Network-wide number of accesses (hits)',},	description=>'Network-wide number of accesses (hits)',},
Line 1004 ENDHEADER	Line 770 ENDHEADER
description=>'Degree of difficulty',},	description=>'Degree of difficulty',},
{ name => 'disc',	{ name => 'disc',
description=>'Degree of discrimination'}) {	description=>'Degree of discrimination'}) {
$scrout .= '<tr><td align="right">'.	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($statistic->{'description'})))
&titlefield(&mt($statistic->{'description'})).	.'<input type="text" name="'.$statistic->{'name'}
'</td><td align="center">'.	.'_min" value="" size="6" />'
'<input type="text" name="'.$statistic->{'name'}.	.' '
'_min" value="" size="6" /></td><td align="center">'.	.'<input type="text" name="'.$statistic->{'name'}
'<input type="text" name="'.$statistic->{'name'}.	.'_max" value="" size="6" />'
'_max" value="" size="6" /></td></tr>'.$/;	.&Apache::lonhtmlcommon::row_closure();
}	}
$scrout .= "</table>\n";
$scrout .= '<h3>'.&mt('Evaluation Data').'</h3>';	$scrout .= &Apache::lonhtmlcommon::row_headline()
$scrout .= "<table>\n";	.'<h3>'.&mt('Evaluation Data').'</h3>'
$scrout .= '<tr><td> </td><td align="center">'.	.&Apache::lonhtmlcommon::row_closure();
&mt('Minimum').'</td>'.'<td align="center">'.	$scrout .= &Apache::lonhtmlcommon::row_title('')
&mt('Maximum').'</td></tr>'."\n";	.&mt('Minimum').' \| '.&mt('Maximum')
	.&Apache::lonhtmlcommon::row_closure();
foreach my $evaluation	foreach my $evaluation
( { name => 'clear',	( { name => 'clear',
description => 'Material presented in clear way'},	description => 'Material presented in clear way'},
Line 1029 ENDHEADER	Line 796 ENDHEADER
description => 'Material appears to be correct'},	description => 'Material appears to be correct'},
{ name => 'technical',	{ name => 'technical',
description => 'Resource is technically correct'}){	description => 'Resource is technically correct'}){
$scrout .= '<tr><td align="right">'.	$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($evaluation->{'description'})))
&titlefield(&mt($evaluation->{'description'})).	.'<input type="text" name="'
'</td><td align="center">'.	.$evaluation->{'name'}.'_min" value="" size="6" />'
'<input type="text" name="'.	.' '
$evaluation->{'name'}.'_min" value="" size="6" />'.	.'<input type="text" name="'
'</td><td align="center"><input type="text" name="'.	.$evaluation->{'name'}.'_max" value="" size="6" />'
$evaluation->{'name'}.'_max" value="" size="6" />'.	.&Apache::lonhtmlcommon::row_closure();
'</td></tr>'.$/;
}	}
$scrout .= "</table>\n";
}	}
#	#
# Creation/Modification date limits	# Creation/Modification date limits
$scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>';	$scrout .= &Apache::lonhtmlcommon::row_headline()
$scrout .= "\n<table>\n";	.'<h3>'.&mt('Creation and Modification dates').'</h3>'
$scrout .= "<tr><td> </td><td>".&mt('(Month - Day - Year)')."</td></tr>\n";	.&Apache::lonhtmlcommon::row_closure();
	$scrout .= &Apache::lonhtmlcommon::row_title('')
	.&mt('Month[_1]Day[_2]Year',' 'x14,' 'x6)
	.&Apache::lonhtmlcommon::row_closure();

my $cafter =	my $cafter =
&Apache::lonhtmlcommon::date_setter('advsearch', # formname	&Apache::lonhtmlcommon::date_setter('advsearch', # formname
'creationdate1', # fieldname	'creationdate1', # fieldname
Line 1063 ENDHEADER	Line 832 ENDHEADER
'', # state	'', # state
1, # no_hh_mm_ss	1, # no_hh_mm_ss
);	);
$scrout .= '<tr><td align="right">'.&mt('Created between').'</td>'	$scrout .= &Apache::lonhtmlcommon::row_title(&mt('Created between'))
.'<td>'.$cafter.'</td></tr>'	.$cafter
.'<tr><td align="right">'.&mt('and').'</td>'	.&Apache::lonhtmlcommon::row_closure(1)
.'<td>'.$cbefore.'</td></tr>';	.&Apache::lonhtmlcommon::row_title(&mt('and'))
	.$cbefore
	.&Apache::lonhtmlcommon::row_closure();

my $lafter =	my $lafter =
&Apache::lonhtmlcommon::date_setter('advsearch',	&Apache::lonhtmlcommon::date_setter('advsearch',
'revisiondate1',	'revisiondate1',
Line 1085 ENDHEADER	Line 857 ENDHEADER
'', # state	'', # state
1, # no_hh_mm_ss	1, # no_hh_mm_ss
);	);
$scrout .= '<tr><td align="right">'.&mt('Last modified between').'</td>'	$scrout .= &Apache::lonhtmlcommon::row_title(&mt('Last modified between'))
.'<td>'.$lafter.'</td></tr>'	.$lafter
.'<tr><td align="right">'.&mt('and').'</td>'	.&Apache::lonhtmlcommon::row_closure(1)
.'<td>'.$lbefore.'</td></tr>';	.&Apache::lonhtmlcommon::row_title(&mt('and'))
$scrout.="</table>\n";	.$lbefore
$scrout.=<<ENDDOCUMENT;	.&Apache::lonhtmlcommon::row_closure(1); # Last row of total pick_box
$advanced_buttons
</form>	$scrout .= &Apache::lonhtmlcommon::end_pick_box();
ENDDOCUMENT
	$scrout .= $advanced_buttons
	.'</form>';

$scrout .= &Apache::loncommon::end_page();	$scrout .= &Apache::loncommon::end_page();
$r->print($scrout);	$r->print($scrout);
return;	return;
Line 1167 sub viewoptions {	Line 942 sub viewoptions {
if (! defined($env{'form.viewselect'})) {	if (! defined($env{'form.viewselect'})) {
$env{'form.viewselect'}='detailed';	$env{'form.viewselect'}='detailed';
}	}
$scrout.=&Apache::lonmeta::selectbox('viewselect',	$scrout .= '<span class="LC_nobreak">'
$env{'form.viewselect'},	.&mt('Type:').' '
\&viewoptiontext,	.&Apache::lonmeta::selectbox('viewselect',
sort(keys(%Views)));	$env{'form.viewselect'},
$scrout.= '  ';	\&viewoptiontext,
	sort(keys(%Views)))
	.'</span>';
my $countselect = &Apache::lonmeta::selectbox('show',	my $countselect = &Apache::lonmeta::selectbox('show',
$env{'form.show'},	$env{'form.show'},
undef,	undef,
(10,20,50,100,1000,10000));	(10,20,50,100,1000,10000));
$scrout .= (' 'x2).&mt('[_1] Records per Page',$countselect).	$scrout .= ' <span class="LC_nobreak">'
'</nobr>'.$/;	.&mt('Records per Page:').' '.$countselect
	.'</span>'.$/;
return $scrout;	return $scrout;
}	}

Line 1268 Outputs: array of values. Returns undef	Line 1046 Outputs: array of values. Returns undef

This function is the reverse of &make_persistent();	This function is the reverse of &make_persistent();
Retrieve persistent data from %persistent_db. Retrieved items will have their	Retrieve persistent data from %persistent_db. Retrieved items will have their
values unescaped. If the item contains commas (before unescaping), the	values unescaped. If the item is 'domains; then the returned
returned value will be an array pointer.	value will be a hash pointer. Otherwise, if the item contains
	commas (before unescaping), the returned value will be an array pointer.

=cut	=cut

Line 1287 sub get_persistent_data {	Line 1066 sub get_persistent_data {
push @Values, undef;	push @Values, undef;
next;	next;
}	}
my @values = map {	if ($name eq 'domains') {
&unescape($_);	my %valueshash;
} split(',',$persistent_db{$name});	my @items= map { &unescape($_); } split(',',$persistent_db{$name});
if (@values <= 1) {	foreach my $item (@items) {
push @Values,$values[0];	if ($item =~ /=/) {
	my ($key,$val) = map { &unescape($_); } split(/=/,$item);
	$valueshash{$key} = $val;
	}
	}
	push(@Values,\%valueshash);
} else {	} else {
push @Values,\@values;	my @values = map {
	&unescape($_);
	} split(',',$persistent_db{$name});
	if (@values <= 1) {
	push @Values,$values[0];
	} else {
	push @Values,\@values;
	}
}	}
}	}
untie (%persistent_db);	untie (%persistent_db);
Line 1311 Inputs: Hash of values to save, filename	Line 1102 Inputs: Hash of values to save, filename

Store variables away to the %persistent_db.	Store variables away to the %persistent_db.
Values will be escaped. Values that are array pointers will have their	Values will be escaped. Values that are array pointers will have their
elements escaped and concatenated in a comma separated string.	elements escaped and concatenated in a comma separated string. Values
	that are hash pointers will have their keys and values escaped and
	concatenated in a comma separated string.

=cut	=cut

Line 1323 sub make_persistent {	Line 1116 sub make_persistent {
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)) {
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));	my @values=();
# We handle array references, but not recursively.	if (ref($save{$name}) eq 'ARRAY') {
	@values = @{$save{$name}};
	} elsif (ref($save{$name}) eq 'HASH') {
	foreach my $key (%{$save{$name}}) {
	push(@values,&escape($key).'='.&escape($save{$name}{$key}));
	}
	} else {
	@values = $save{$name};
	}
	# We handle array and hash references, but not recursively.
my $store = join(',', map { &escape($_); } @values );	my $store = join(',', map { &escape($_); } @values );
$persistent_db{$name} = $store;	$persistent_db{$name} = $store;
}	}
Line 1403 sub parse_advanced_search {	Line 1205 sub parse_advanced_search {
'lastrevisiondatestart_month','lastrevisiondatestart_day',	'lastrevisiondatestart_month','lastrevisiondatestart_day',
'lastrevisiondatestart_year','lastrevisiondateend_month',	'lastrevisiondatestart_year','lastrevisiondateend_month',
'lastrevisiondateend_day','lastrevisiondateend_year') {	'lastrevisiondateend_day','lastrevisiondateend_year') {
$env{'form.'.$field}=~s/[^\w\/\s\=\-\"\'.]//g;	$env{'form.'.$field}=~s/[^\w\/\s\=\-\"\'.\*]//g;
}	}
foreach ('mode','form','element') {	foreach ('mode','form','element') {
# is this required? Hmmm.	# is this required? Hmmm.
Line 1641 sub parse_advanced_search {	Line 1443 sub parse_advanced_search {
##	##
## Deal with restrictions to given domains	## Deal with restrictions to given domains
##	##
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions();	my ($libraries_to_query,$pretty_domains_string,$domains_to_query) =
	&parse_domain_restrictions();
if ($pretty_domains_string) {	if ($pretty_domains_string) {
$pretty_search_string .= $pretty_domains_string."<br />\n";	$pretty_search_string .= $pretty_domains_string."<br />\n";
}	}
#	#
if (@queries) {	if (@queries) {
if ($env{'form.area'} eq 'portfolio') {	if ($env{'form.area'} eq 'portfolio') {
$query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND (".join(') AND (',@queries).'))';	$query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND (".join(') AND (',@queries).'))';
} else {	} else {
$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';	$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
}	}
Line 1657 sub parse_advanced_search {	Line 1460 sub parse_advanced_search {
}	}
#&Apache::lonnet::logthis('advanced 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,$domains_to_query);
}	}

sub parse_domain_restrictions {	sub parse_domain_restrictions {
my $libraries_to_query = undef;	my $libraries_to_query = undef;
	my $domains_to_query = undef;
# $env{'form.domains'} can be either a scalar or an array reference.	# $env{'form.domains'} can be either a scalar or an array reference.
# We need an array.	# We need an array.
if (! exists($env{'form.domains'}) \|\| $env{'form.domains'} eq '') {	if (! exists($env{'form.domains'}) \|\| $env{'form.domains'} eq '') {
Line 1685 sub parse_domain_restrictions {	Line 1489 sub parse_domain_restrictions {
foreach (sort @allowed_domains) {	foreach (sort @allowed_domains) {
$pretty_domains_string .= "<b>".$_."</b> ";	$pretty_domains_string .= "<b>".$_."</b> ";
}	}
my %servers = &Apache::lonnet::get_servers(\@allowed_domains,	my %library_servers = &Apache::lonnet::get_unique_servers(\@allowed_domains,
'library');	'library');
	my (%older_library_servers,%okdoms,%domains_for_id);
	map { $okdoms{$_} = 1; } @allowed_domains;
	foreach my $key (keys(%library_servers)) {
	if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) {
	my $major = $1;
	my $minor = $2;
	if (($major < 2) \|\| (($major == 2) && ($minor < 11))) {
	map { $older_library_servers{$_} = 1; }
	&Apache::lonnet::machine_ids($library_servers{$key});
	} else {
	my %possdoms;
	map { $possdoms{$_}=1 if ($okdoms{$_}); }
	&Apache::lonnet::machine_domains($library_servers{$key});
	$domains_for_id{$key} = join(',',sort(keys(%possdoms)));
	}
	}
	}
	my %servers = (%library_servers,%older_library_servers);
$libraries_to_query = [keys(%servers)];	$libraries_to_query = [keys(%servers)];
	$domains_to_query = \%domains_for_id;
}	}
return ($libraries_to_query,	return ($libraries_to_query,
$pretty_domains_string);	$pretty_domains_string,
	$domains_to_query);
}	}

######################################################################	######################################################################
Line 1711 sub parse_basic_search {	Line 1535 sub parse_basic_search {
#	#
# Clean up fields for safety	# Clean up fields for safety
for my $field ('basicexp') {	for my $field ('basicexp') {
$env{"form.$field"}=~s/[^\w\s\'\"\!\-]//g;	$env{"form.$field"}=~s/[^\w\s\'\"\!\-\*]//g;
}	}
foreach ('mode','form','element') {	foreach ('mode','form','element') {
# is this required? Hmmm.	# is this required? Hmmm.
Line 1719 sub parse_basic_search {	Line 1543 sub parse_basic_search {
$env{"form.$_"}=&unescape($env{"form.$_"});	$env{"form.$_"}=&unescape($env{"form.$_"});
$env{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;	$env{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions();	my ($libraries_to_query,$pretty_domains_string,$domains_to_query) =
	&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
my $search_string = $env{'form.basicexp'};	my $search_string = $env{'form.basicexp'};
Line 1750 sub parse_basic_search {	Line 1575 sub parse_basic_search {
#}	#}
my $final_query;	my $final_query;
if ($env{'form.area'} eq 'portfolio') {	if ($env{'form.area'} eq 'portfolio') {
$final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND '.join(" AND ",@Queries).')';	$final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND '.join(" AND ",@Queries).')';
} else {	} else {
$final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);	$final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
}	}
Line 1765 sub parse_basic_search {	Line 1590 sub parse_basic_search {
$pretty_search_string =~ s:^<br /> and ::;	$pretty_search_string =~ s:^<br /> and ::;
&Apache::lonnet::logthis('simple search final query = '.$/.$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,$domains_to_query);
}	}


Line 2037 sub build_date_queries {	Line 1862 sub build_date_queries {
if ((defined($cafter) && ! defined($cbefore)) \|\|	if ((defined($cafter) && ! defined($cbefore)) \|\|
(defined($cbefore) && ! defined($cafter))) {	(defined($cbefore) && ! defined($cafter))) {
# This is bad, so let them know	# This is bad, so let them know
$error = &mt('Incorrect entry for the creation date. '.	$error = &mt('Incorrect entry for the creation date. '.
'You must specify both the beginning and ending dates.');	'You must specify both the beginning and ending dates.');
}	}
if (! defined($error) &&	if (! defined($error) &&
((defined($mafter) && ! defined($mbefore)) \|\|	((defined($mafter) && ! defined($mbefore)) \|\|
(defined($mbefore) && ! defined($mafter)))) {	(defined($mbefore) && ! defined($mafter)))) {
# This is also bad, so let them know	# This is also bad, so let them know
$error = &mt('Incorrect entry for the last revision date. '.	$error = &mt('Incorrect entry for the last revision date. '.
'You must specify both the beginning and ending dates.');	'You must specify both the beginning and ending dates.');
}	}
if (! defined($error)) {	if (! defined($error)) {
Line 2116 sub copyright_check {	Line 1941 sub copyright_check {
my (undef,undef,$resdom,$resname) = split('/',	my (undef,undef,$resdom,$resname) = split('/',
$Metadata->{'url'});	$Metadata->{'url'});
# Check for priv	# Check for priv
if (($Metadata->{'copyright'} eq 'priv') &&	if ($Metadata->{'copyright'} eq 'priv') {
(($env{'user.name'} ne $resname) &&	unless (($env{'user.name'} eq $resname) &&
($env{'user.domain'} ne $resdom))) {	($env{'user.domain'} eq $resdom)) {
return 0;	return 0;
	}
}	}
# Check for domain	# Check for domain
if (($Metadata->{'copyright'} eq 'domain') &&	if (($Metadata->{'copyright'} eq 'domain') &&
($env{'user.domain'} ne $resdom)) {	($env{'user.domain'} ne $resdom)) {
return 0;	return 0;
}	}
	# Check for custom rights
	if ($Metadata->{'copyright'} eq 'custom') {
	return &Apache::lonnet::customaccess('bre',$Metadata->{'url'});
	}
return 1;	return 1;
}	}

Line 2153 sub ensure_db_and_table {	Line 1983 sub ensure_db_and_table {
## Sanity check the table id.	## Sanity check the table id.
##	##
if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {	if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {
$r->print("Unable to retrieve search results. ".	$r->print(&Apache::loncommon::start_page('Error')
"Unable to determine the table results were saved in. ".	.'<p class="LC_error">'
&Apache::loncommon::end_page());	.&mt('Unable to retrieve search results. '
	.'Unable to determine the table results were saved in.')
	.'</p>'
	. '<p>'.&mt('Internal info:').'</p>'
	.'<pre>'.$table.'</pre>'
	.&Apache::loncommon::end_page()
	);
return undef;	return undef;
}	}
##	##
Line 2163 sub ensure_db_and_table {	Line 1999 sub ensure_db_and_table {
##	##
my $connection_result = &Apache::lonmysql::connect_to_db();	my $connection_result = &Apache::lonmysql::connect_to_db();
if (!defined($connection_result)) {	if (!defined($connection_result)) {
$r->print("Unable to connect to the MySQL database where your results".	$r->print(
" are saved.".	'<p class="LC_error">'
&Apache::loncommon::end_page());	.&mt('Unable to connect to the MySQL database where your results are saved.')
	.'</p>'
	.&Apache::loncommon::end_page()
	);
&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".	&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".
" connect to database.");	" connect to database.");
&Apache::lonnet::logthis(&Apache::lonmysql::get_error());	&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
Line 2173 sub ensure_db_and_table {	Line 2012 sub ensure_db_and_table {
}	}
my $table_check = &Apache::lonmysql::check_table($table);	my $table_check = &Apache::lonmysql::check_table($table);
if (! defined($table_check)) {	if (! defined($table_check)) {
$r->print("A MySQL error has occurred.</form>".	$r->print(
&Apache::loncommon::end_page());	'<p class="LC_error">'
	.&mt('A MySQL error has occurred.')
	.'</p></form>'
	.&Apache::loncommon::end_page());
&Apache::lonnet::logthis("lonmysql was unable to determine the status".	&Apache::lonnet::logthis("lonmysql was unable to determine the status".
" of table ".$table);	" of table ".$table);
return undef;	return undef;
} elsif (! $table_check) {	} elsif (! $table_check) {
$r->print("The table of results could not be found.");	$r->print(
	'<p class="LC_error">'
	.&mt('The table of results could not be found.')
	.'</p>'
	);
&Apache::lonnet::logthis("The user requested a table, ".$table.	&Apache::lonnet::logthis("The user requested a table, ".$table.
", that could not be found.");	", that could not be found.");
return undef;	return undef;
Line 2235 sub print_sort_form {	Line 2081 sub print_sort_form {
&Apache::lonnet::logthis(&Apache::lonmysql::get_error());	&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
return;	return;
}	}
my $js =<<END;	my $start_page = &Apache::loncommon::start_page('Results',undef);
<script type="text/javascript">
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>
END

my $start_page = &Apache::loncommon::start_page('Results',$js,
{'no_title' => 1});
my $breadcrumbs=	my $breadcrumbs=
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
$env{'form.catalogmode'} ne 'import');	$env{'form.catalogmode'} ne 'import');
Line 2274 END	Line 2107 END
# $result.="</select>\n";	# $result.="</select>\n";
my $revise = &revise_button();	my $revise = &revise_button();
$result.='<p>'	$result.='<p>'
.&mt('There are [_1] matches to your query.',$total_results)	.&mt('Total of [quant,_1,match,matches] to your query.',$total_results)
.' '.$revise.'</p>'	.' '.$revise.'</p>'
.'<p>'.&mt('Search: ').$pretty_query_string	.'<p>'.&mt('Search: ').$pretty_query_string
.'</p></form>';	.'</p></form>';
Line 2387 Returns: Nothing.	Line 2220 Returns: Nothing.
sub update_count_status {	sub update_count_status {
my ($r,$text) = @_;	my ($r,$text) = @_;
$text =~ s/\'/\\\'/g;	$text =~ s/\'/\\\'/g;
$r->print	$r->print(<<SCRIPT);
("<script>document.statusform.count.value = ' $text'</script>\n");	<script type="text/javascript">
	// <![CDATA[
	document.statusform.count.value = ' $text'
	// ]]>
	</script>
	SCRIPT

$r->rflush();	$r->rflush();
}	}

sub update_status {	sub update_status {
my ($r,$text) = @_;	my ($r,$text) = @_;
$text =~ s/\'/\\\'/g;	$text =~ s/\'/\\\'/g;
$r->print	$r->print(<<SCRIPT);
("<script>document.statusform.status.value = ' $text'</script>\n");	<script type="text/javascript">
	// <![CDATA[
	document.statusform.status.value = ' $text'
	// ]]>
	</script>
	SCRIPT

	$r->rflush();
	}

	sub reload_result_frame {
	my ($r) = @_;
	my $newloc = '/adm/searchcat?phase=results&persistent_db_id='.
	$env{'form.persistent_db_id'};
	$r->print(<<SCRIPT);
	<script type="text/javascript">
	parent.update_results("$newloc");
	</script>
	SCRIPT

$r->rflush();	$r->rflush();
}	}

{	{
my $max_time = 300; # seconds for the search to complete	my $max_time = 60; # seconds for the search to complete
my $start_time = 0;	my $start_time = 0;
my $last_time = 0;	my $last_time = 0;

Line 2423 sub update_seconds {	Line 2281 sub update_seconds {
my ($r) = @_;	my ($r) = @_;
my $time = &time_left();	my $time = &time_left();
if (($last_time-$time) > 0) {	if (($last_time-$time) > 0) {
$r->print("<script>".	$r->print(<<SCRIPT);
"document.statusform.seconds.value = '$time'".	<script type="text/javascript">
"</script>\n");	// <![CDATA[
	document.statusform.seconds.value = '$time'
	// ]]>
	</script>
	SCRIPT

$r->rflush();	$r->rflush();
}	}
$last_time = $time;	$last_time = $time;
Line 2454 sub revise_button {	Line 2317 sub revise_button {
$revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced');	$revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced');
my $newloc = '/adm/searchcat'.	my $newloc = '/adm/searchcat'.
'?persistent_db_id='.$env{'form.persistent_db_id'}.	'?persistent_db_id='.$env{'form.persistent_db_id'}.
'&cleargroupsort=1'.	'&cleargroupsort=1'.
'&phase='.$revise_phase;	'&phase='.$revise_phase;
my $result = qq{<input type="button" value="$revisetext" name="revise"} .	my $result = qq{<input type="button" value="$revisetext" name="revise"} .
qq{ onClick="parent.location='$newloc';" /> };	qq{ onclick="parent.location='$newloc';" /> };
return $result;	return $result;
}	}

Line 2477 results into MySQL.	Line 2340 results into MySQL.
######################################################################	######################################################################
sub run_search {	sub run_search {
my ($r,$query,$customquery,$customshow,$serverlist,	my ($r,$query,$customquery,$customshow,$serverlist,
$pretty_string,$area) = @_;	$pretty_string,$area,$domainsref) = @_;
my $tabletype = 'metadata';	my $tabletype = 'metadata';
if ($area eq 'portfolio') {	if ($area eq 'portfolio') {
$tabletype = 'portfolio_search';	$tabletype = 'portfolio_search';
Line 2486 sub run_search {	Line 2349 sub run_search {
#	#
# Print run_search header	# Print run_search header
#	#
my $start_page = &Apache::loncommon::start_page('Search Status',undef,	my $start_page = &Apache::loncommon::start_page('Search Status',undef);
{'no_title' => 1});
my $breadcrumbs =	my $breadcrumbs =
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
$env{'form.catalogmode'} ne 'import');	$env{'form.catalogmode'} ne 'import');
$r->print(<<END);	$r->print(<<END);
$start_page	$start_page
$breadcrumbs	$breadcrumbs
<form name="statusform" action="" method="post">
<input type="hidden" name="acts" value="" />
END	END
# Remove leading and trailing <br />	# Remove leading and trailing <br />
$pretty_string =~ s:^\s*<br />::i;	$pretty_string =~ s:^\s*<br />::i;
Line 2506 END	Line 2366 END
pop(@Lines);	pop(@Lines);
}	}
if (@Lines > 2) {	if (@Lines > 2) {
$pretty_string = join '<br />',(@Lines[0..2],'....<br />');	$pretty_string = join '<br />',(@Lines[0..2],'...<br />');
}	}
$r->print(&mt("Search: [_1]",$pretty_string));	$r->print(&mt("Search: [_1]",$pretty_string));
$r->rflush();	$r->rflush();
#	#
# Determine the servers we need to contact.	# Determine the servers we need to contact.
my @Servers_to_contact;	my (@Servers_to_contact,%domains_by_server);
if (defined($serverlist)) {	if (defined($serverlist)) {
if (ref($serverlist) eq 'ARRAY') {	if (ref($serverlist) eq 'ARRAY') {
@Servers_to_contact = @$serverlist;	@Servers_to_contact = @$serverlist;
} else {	} else {
@Servers_to_contact = ($serverlist);	@Servers_to_contact = ($serverlist);
}	}
	if (ref($domainsref) eq 'HASH') {
	foreach my $server (@Servers_to_contact) {
	$domains_by_server{$server} = $domainsref->{$server};
	}
	}
} else {	} else {
my %all_library_servers = &Apache::lonnet::all_library();	my %library_servers = &Apache::lonnet::unique_library();
	my (%all_library_servers, %older_library_servers);
	foreach my $key (keys(%library_servers)) {
	if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) {
	my $major = $1;
	my $minor = $2;
	if (($major < 2) \|\| (($major == 2) && ($minor < 11))) {
	map { $older_library_servers{$_} = 1; }
	&Apache::lonnet::machine_ids($library_servers{$key});
	}
	}
	}
	%all_library_servers = (%library_servers,%older_library_servers);
@Servers_to_contact = sort(keys(%all_library_servers));	@Servers_to_contact = sort(keys(%all_library_servers));
	foreach my $server (@Servers_to_contact) {
	$domains_by_server{$server} =
	join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
	}
}	}
my %Server_status;	my %Server_status;
#	#
Line 2557 END	Line 2438 END
##	##
## Prepare for the big loop.	## Prepare for the big loop.
my $hitcountsum;	my $hitcountsum;
	my $oldhitcountsum;
	my $displaycount;
my %matches;	my %matches;
my $server;	my $server;
my $status;	my $status;
my $revise = &revise_button();	my $revise = &revise_button();
$r->print(<<END);	$r->print('<form name="statusform" action="" method="post">'."\n".
<table>	'<input type="hidden" name="acts" value="" />'."\n".
<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>	'<table border="0"><tr><td>'."\n".
<tr>	&Apache::loncommon::start_data_table());
<td><input type="text" name="status" value="" size="50" /></td>	$r->print(&Apache::loncommon::start_data_table_header_row()
<td><input type="text" name="count" value="" size="10" /></td>	.'<th>'.&mt('Status').'</th>'
<td><input type="text" name="seconds" value="" size="8" /></td>	.'<th>'.&mt('Total Matches').'</th>'
<td>$revise</td>	.'<th>'.&mt('Time Remaining').'</th>'
</tr>	.&Apache::loncommon::end_data_table_header_row()
</table>	.&Apache::loncommon::start_data_table_row()
</form>	.'<td><input type="text" name="status" value="" size="50" readonly="readonly" /></td>'
END	.'<td><input type="text" name="count" value="" size="10" readonly="readonly" /></td>'
	.'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
	.&Apache::loncommon::end_data_table_row()
	.&Apache::loncommon::end_data_table()
	.'</td><td> </td><td>'.$revise.'</td></tr></table></form>');
$r->rflush();	$r->rflush();
&reset_timing();	&reset_timing();
&update_seconds($r);	&update_seconds($r);
Line 2587 END	Line 2474 END
my $server = shift(@Servers_to_contact);	my $server = shift(@Servers_to_contact);
&update_status($r,&mt('contacting [_1]',$server));	&update_status($r,&mt('contacting [_1]',$server));
my $reply=&Apache::lonnet::metadata_query($query,$customquery,	my $reply=&Apache::lonnet::metadata_query($query,$customquery,
$customshow,[$server]);	$customshow,[$server],\%domains_by_server);
($server) = keys(%$reply);	($server) = keys(%$reply);
$Server_status{$server} = $reply->{$server};	$Server_status{$server} = $reply->{$server};
} else {	} else {
Line 2599 END	Line 2486 END
&update_status($r,	&update_status($r,
&mt('waiting on [_1]',join(' ',keys(%Server_status))));	&mt('waiting on [_1]',join(' ',keys(%Server_status))));
}	}
sleep(1);	sleep(0.1);
}	}
#	#
# Loop through the servers we have contacted but do not	# Loop through the servers we have contacted but do not
Line 2613 END	Line 2500 END
next;	next;
}	}
$status=~s\|/\|\|g;	$status=~s\|/\|\|g;
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$status;


	my $datafile=LONCAPA::tempdir().$status;
if (-e $datafile && ! -e "$datafile.end") {	if (-e $datafile && ! -e "$datafile.end") {
&update_status($r,&mt('Receiving results from [_1]',$server));	&update_status($r,&mt('Receiving results from [_1]',$server));
next;	next;
Line 2644 END	Line 2534 END
my %Fields = &parse_raw_result($result,$server,$tabletype);	my %Fields = &parse_raw_result($result,$server,$tabletype);
$Fields{'hostname'} = $server;	$Fields{'hostname'} = $server;
#	#
# Skip if external and we did not want that
next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//));
# Skip based on copyright	# Skip based on copyright
next if (! &copyright_check(\%Fields));	next if (! &copyright_check(\%Fields));

Line 2674 END	Line 2562 END
delete($Server_status{$server});	delete($Server_status{$server});
}	}
last if ($connection->aborted());	last if ($connection->aborted());
&update_count_status($r,$hitcountsum);	if ($oldhitcountsum < $hitcountsum) {
	&update_count_status($r,$hitcountsum);
	if (($hitcountsum <= $env{'form.show'}) \|\|
	(!$displaycount && $hitcountsum)) {
	reload_result_frame($r);
	$displaycount = $hitcountsum;
	}
	$oldhitcountsum = $hitcountsum;
	}
}	}
last if ($connection->aborted());	last if ($connection->aborted());
&update_seconds($r);	&update_seconds($r);
}	}
&update_status($r,&mt('Search Complete [_1]',$server));	&update_status($r,&mt('Search Complete on Server [_1]',$server));
&update_seconds($r);	&update_seconds($r);
#	#
&Apache::lonmysql::disconnect_from_db(); # This is unneccessary	&Apache::lonmysql::disconnect_from_db(); # This is unneccessary
Line 2689 END	Line 2585 END
# loaded from /adm/searchcat	# loaded from /adm/searchcat
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
# if ($env{'form.catalogmode'} ne 'import') {	# if ($env{'form.catalogmode'} ne 'import') {
$r->print("<script>".	$r->print(<<SCRIPT);
"window.location='/adm/searchcat?".	<script>
"phase=sort&".	window.location='/adm/searchcat?phase=sort&persistent_db_id=$env{'form.persistent_db_id'}';
"persistent_db_id=$env{'form.persistent_db_id'}';".	</script>
"</script>");	SCRIPT
# }	# }
return;	return;
}	}
Line 2716 sub prev_next_buttons {	Line 2612 sub prev_next_buttons {
return '' if ($show eq 'all'); # No links if you get them all at once.	return '' if ($show eq 'all'); # No links if you get them all at once.
#	#
# Create buttons	# Create buttons
my $buttons = '<input type="submit" name="prev" value="'.&mt('Prev').'" ';	return '<p class="LC_nobreak">'
$buttons .= '/>';	.'<input type="submit" name="prev" value="<"'
$buttons .= ' 'x3;	.' title="'.&mt('Previous').'" />'
$buttons .= '<input type="submit" name="reload" '.	.' '
'value="'.&mt('Reload').'" />';	.'<input type="submit" name="reload" value="'.&mt('Reload').'" />'
$buttons .= ' 'x3;	.' '
$buttons .= '<input type="submit" name="next" value="'.&mt('Next').'" ';	.'<input type="submit" name="next" value=">"'
$buttons .= '/>';	.' title="'.&mt('Next').'" />'
return $buttons;	.'</p>';
}	}

######################################################################	######################################################################
Line 2749 sub display_results {	Line 2645 sub display_results {
##	##
my $viewfunction = $Views{$env{'form.viewselect'}};	my $viewfunction = $Views{$env{'form.viewselect'}};
if (!defined($viewfunction)) {	if (!defined($viewfunction)) {
$r->print("Internal Error - Bad view selected.\n");	$r->print('<p class="LC_error">'
	.&mt('Internal Error - Bad view selected.')
	.'</p>'."\n");
$r->rflush();	$r->rflush();
return;	return;
}	}
Line 2766 sub display_results {	Line 2664 sub display_results {
if ($env{'form.catalogmode'} eq 'import') {	if ($env{'form.catalogmode'} eq 'import') {
if (! tie(%groupsearch_db,'GDBM_File',$diropendb,	if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
&GDBM_WRCREAT(),0640)) {	&GDBM_WRCREAT(),0640)) {
$r->print('Unable to save import results.</form>'.	# NOTE: this can happen when a previous request to searchcat?phase=results gets interrupted
	# (%groupsearch_db is not untied)
	$r->print('<p class="LC_error">'.
	&mt('Unable to save import results.').
	'</p>'.
	'</form>'.
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
$r->rflush();	$r->rflush();
return;	return;
}	}
	# untie %groupsearch_db if the connection gets aborted before the end
	$r->register_cleanup(sub {
	untie %groupsearch_db if (tied(%groupsearch_db));
	});
}	}
##	##
## Prepare the table for querying	## Prepare the table for querying
Line 2780 sub display_results {	Line 2687 sub display_results {
## 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.</form>".	$r->print('<p class="LC_error">'.
	&mt('A MySQL error has occurred.').
	'</p>'.
	'</form>'.
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
&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);
Line 2885 sub display_results {	Line 2795 sub display_results {
$env{'form.sortorder'}='asc';	$env{'form.sortorder'}='asc';
}	}
}	}
my $sortform = &mt('Sort by [_1] [_2]',	my $sortform = '<span class="LC_nobreak">'
&Apache::loncommon::select_form($env{'form.sortfield'},	.&mt('Sort by:').' '
	.&Apache::loncommon::select_form($env{'form.sortfield'},
'sortfield',	'sortfield',
%sort_fields),	\%sort_fields)
&Apache::loncommon::select_form($env{'form.sortorder'},	.' '
	.&Apache::loncommon::select_form($env{'form.sortorder'},
'sortorder',	'sortorder',
(asc =>&mt('Ascending'),	{asc =>&mt('Ascending'),
desc=>&mt('Descending')	desc=>&mt('Descending')
))	})
);	.'</span>';
##	##
## Output links (if necessary) for 'prev' and 'next' pages.	## Display links for 'prev' and 'next' pages (if necessary) and Display Options
$r->print	$r->print('<fieldset>'."\n"
('<table width="100%"><tr><td width="25%" align="right">'.	.'<legend>'.&mt('Display Options').'</legend>'."\n"
'<nobr>'.$sortform.'</nobr>'.	.$sortform
'</td><td width="25%" align="right">'.	.' '
&prev_next_buttons($min,$env{'form.show'},$total_results).	.&viewoptions()
'</td><td align="right">'.	.'</fieldset>'
&viewoptions().'</td></tr></table>'	.&prev_next_buttons($min,$env{'form.show'},$total_results)
);	);

if ($total_results == 0) {	if ($total_results == 0) {
$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2" />'.	$r->print('<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
'<h3>'.&mt('There are currently no results').'.</h3>'.
"</form>".	"</form>".
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
return;	return;
} else {	} else {
$r->print('<center>'.	$r->print('<div>'.
mt('Results [_1] to [_2] out of [_3]',	mt('Results [_1] to [_2] out of [_3]',
$min,$max,$total_results).	$min,$max,$total_results).
"</center>\n");	"</div>\n");
}	}
##	##
## Get results from MySQL table	## Get results from MySQL table
Line 2945 sub display_results {	Line 2857 sub display_results {
if ($area eq 'portfolio') {	if ($area eq 'portfolio') {
$tabletype = 'portfolio_search';	$tabletype = 'portfolio_search';
}	}
	$r->print(&Apache::loncommon::start_data_table());
foreach my $row (@Results) {	foreach my $row (@Results) {
if ($connection->aborted()) {	if ($connection->aborted()) {
&cleanup();	&cleanup();
return;	return;
}	}
my %Fields = %{&parse_row($tabletype,@$row)};	my %Fields = %{&parse_row($tabletype,@$row)};
my $output="<p>\n";	my $output;
if (! defined($Fields{'title'}) \|\| $Fields{'title'} eq '') {	if (! defined($Fields{'title'}) \|\| $Fields{'title'} eq '') {
$Fields{'title'} = 'Untitled';	$Fields{'title'} = 'Untitled';
}	}
Line 2960 sub display_results {	Line 2873 sub display_results {
# Render the result into html	# Render the result into html
$output.= &$viewfunction($prefix,%Fields);	$output.= &$viewfunction($prefix,%Fields);
# Print them out as they come in.	# Print them out as they come in.
$r->print($output);	$r->print(&Apache::loncommon::start_data_table_row()
	.'<td>'
	.$output
	.'</td>'
	.&Apache::loncommon::end_data_table_row()
	);
$r->rflush();	$r->rflush();
}	}
	$r->print(&Apache::loncommon::end_data_table());
if (@Results < 1) {	if (@Results < 1) {
$r->print(&mt("There were no results matching your query"));	$r->print('<p class="LC_info">'
	.&mt('There were no results matching your query.')
	.'</p>');
} else {	} else {
$r->print	$r->print(
('<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>\n"	);
);
}	}
$r->print("</form>".&Apache::loncommon::end_page());	$r->print("</form>".&Apache::loncommon::end_page());
$r->rflush();	$r->rflush();
Line 3004 sub catalogmode_output {	Line 2923 sub catalogmode_output {
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"
onClick="javascript:select_data('$title','$url')" />	onclick="javascript:select_data('$title','$url')" />
</font>	</font>
END	END
}	}
Line 3014 END	Line 2933 END
$output.=<<END;	$output.=<<END;
<font size='-1'>	<font size='-1'>
<input type="checkbox" name="returnvalues" value="select"	<input type="checkbox" name="returnvalues" value="select"
onClick="javascript:queue($checkbox_num,$fnum)" />	onclick="javascript:queue($checkbox_num,$fnum)" />
</font>	</font>
END	END
}	}
Line 3183 sub search_results_header {	Line 3102 sub search_results_header {
if (! exists($env{'form.mode'}) \|\| $env{'form.mode'} ne 'edit') {	if (! exists($env{'form.mode'}) \|\| $env{'form.mode'} ne 'edit') {
$js.=<<SCRIPT;	$js.=<<SCRIPT;
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function select_data(title,url) {	function select_data(title,url) {
changeTitle(title);	changeTitle(title);
changeURL(url);	changeURL(url);
Line 3198 sub search_results_header {	Line 3118 sub search_results_header {
parent.opener.inf.document.forms.resinfo.elements.u.value=val;	parent.opener.inf.document.forms.resinfo.elements.u.value=val;
}	}
}	}
	// ]]>
</script>	</script>
SCRIPT	SCRIPT
} elsif ($env{'form.mode'} eq 'edit') {	} elsif ($env{'form.mode'} eq 'edit') {
Line 3222 END	Line 3143 END

$js.=<<SCRIPT;	$js.=<<SCRIPT;
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function select_data(title,url) {	function select_data(title,url) {
changeURL(url);	changeURL(url);
changeTitle(title);	changeTitle(title);
Line 3236 function changeURL(val) {	Line 3158 function changeURL(val) {
alert("Unable to transfer data to "+url);	alert("Unable to transfer data to "+url);
}	}
}	}
	// ]]>
</script>	</script>
SCRIPT	SCRIPT
}	}
Line 3243 SCRIPT	Line 3166 SCRIPT
my $inhibit_menu = "&".&Apache::loncommon::inhibit_menu_check();	my $inhibit_menu = "&".&Apache::loncommon::inhibit_menu_check();
$js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import';	$js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import';
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
function queue(checkbox_num,val) {	function queue(checkbox_num,val) {
if (document.forms.results.returnvalues.length != "undefined" &&	if (document.forms.results.returnvalues.length != "undefined" &&
typeof(document.forms.results.returnvalues.length) == "number") {	typeof(document.forms.results.returnvalues.length) == "number") {
Line 3264 SCRIPT	Line 3188 SCRIPT
"/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+	"/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
parent.statusframe.document.forms.statusform.elements.acts.value;	parent.statusframe.document.forms.statusform.elements.acts.value;
}	}
	// ]]>
	</script>
	SCRIPT

	$js.=<<SCRIPT;
	<script type="text/javascript">
	\$(document).ready(function() {
	parent.done_loading_results();
	});
</script>	</script>
SCRIPT	SCRIPT

my $start_page = &Apache::loncommon::start_page(undef,$js,	my $start_page = &Apache::loncommon::start_page(undef,$js,
{'only_body' =>1});	{'only_body' =>1,
	'add_wishlist' =>1,
	'add_modal' =>1});
my $result=<<END;	my $result=<<END;
$start_page	$start_page
<form name="results" method="post" action="/adm/searchcat">	<form name="results" method="post" action="/adm/searchcat">
Line 3278 END	Line 3213 END
}	}

sub results_link {	sub results_link {
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 $results_link = $basic_link."&phase=results".	my $results_link = $basic_link."&phase=results".
"&pause=1"."&start=1";	"&pause=1"."&start=1";
return $results_link;	return $results_link;
}	}

Line 3289 sub results_link {	Line 3224 sub results_link {
######################################################################	######################################################################
sub print_frames_interface {	sub print_frames_interface {
my $r = shift;	my $r = shift;
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 = &results_link();	my $results_link = &results_link();
my $js = <<JS;	my $js = <<JS;
<script type="text/javascript">	<script type="text/javascript">
var targetwin = opener;	var targetwin = opener;
var queue = '';	var queue = '';

	var loading_results = true;
	var need_reloading = false;
	var new_location;
	function update_results(newloc) {
	if (loading_results) {
	need_reloading = true;
	new_location = newloc;
	} else {
	loading_results = true;
	resultsframe.location = newloc;
	}
	}
	function done_loading_results() {
	loading_results = false;
	if (need_reloading) {
	need_reloading = false;
	update_results(new_location);
	}
	}
</script>	</script>
JS	JS

Line 3358 sub evalfields {	Line 3313 sub evalfields {
######################################################################	######################################################################
######################################################################	######################################################################

	sub display_tools {
	my ($title, $jumpurl) = @_;
	my $result;
	# Metadata
	$result.=
	&Apache::loncommon::modal_link(
	$jumpurl.'.meta?inhibitmenu=yes',
	'<img class="LC_icon" src="/res/adm/pages/catalog.png" alt="Info" />',
	500,500,'_blank',undef,&mt('Metadata'));
	# Stored Links
	$result.=
	' <a href="javascript:;"'.
	' onclick="set_wishlistlink('."'$title','$jumpurl'".')" '.
	'title="'.&mt('Save a link for this resource in your personal Stored Links repository').'">'.
	'<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
	'alt="Stored Links" style="width:22px;"/></a>';
	return $result;
	}

	######################################################################
	######################################################################

=pod	=pod

=item Metadata Viewing Functions	=item Metadata Viewing Functions
Line 3382 sub detailed_citation_view {	Line 3359 sub detailed_citation_view {
my $result;	my $result;
my $jumpurl=$values{'url'};	my $jumpurl=$values{'url'};
$jumpurl=~s\|^/ext/\|http://\|;	$jumpurl=~s\|^/ext/\|http://\|;
$result .= '<b>'.$prefix.	$result .=
'<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.' '.	'<b>'.$prefix.
	'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.' '.
'<a href="'.$jumpurl.'?inhibitmenu=yes" '.	'<a href="'.$jumpurl.'?inhibitmenu=yes" '.
'target="preview">'.$values{'title'}."</a></b>\n";	'target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}."</a></b>\n".
$result .= "<p>\n";	&display_tools($values{'title'}, $jumpurl).
$result .= '<b>'.$values{'author'}.'</b>,'.	"<p>\n".
	'<b>'.$values{'author'}.'</b>,'.
' <i>'.$values{'owner'}.'</i><br />';	' <i>'.$values{'owner'}.'</i><br />';
foreach my $field	foreach my $field
(	(
Line 3452 sub detailed_citation_view {	Line 3431 sub detailed_citation_view {
$result .= '<b>'.&mt($field->{'translate'}).'</b>';	$result .= '<b>'.&mt($field->{'translate'}).'</b>';
foreach my $item (split(',',$values{$field->{'name'}})){	foreach my $item (split(',',$values{$field->{'name'}})){
$item = &Apache::lonnet::clutter($item);	$item = &Apache::lonnet::clutter($item);
$result .= &display_url($item,[2,0,1]);	$result .= '<br />'.&display_url($item,1).'<br />';
}	}
} elsif (exists($field->{'format'}) && $field->{'format'} ne ''){	} elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
$result.= &mt($field->{'translate'},	$result.= &mt($field->{'translate'},
Line 3460 sub detailed_citation_view {	Line 3439 sub detailed_citation_view {
$values{$field->{'name'}}))."<br />\n";	$values{$field->{'name'}}))."<br />\n";
} else {	} else {
if ($field->{'special'} eq 'url link') {	if ($field->{'special'} eq 'url link') {
$result .= &display_url($jumpurl,[3,0,1]);	$result .= '<br />'.&display_url($jumpurl,1).'<br />';
} else {	} else {
$result.= &mt($field->{'translate'},	$result.= &mt($field->{'translate'},
$values{$field->{'name'}});	$values{$field->{'name'}});
Line 3475 sub detailed_citation_view {	Line 3454 sub detailed_citation_view {
if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {	if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {
$result .= '<p>'.$values{'shortabstract'}.'</p>';	$result .= '<p>'.$values{'shortabstract'}.'</p>';
}	}
$result .= '<hr align="left" width="200" noshade />'."\n";
return $result;	return $result;
}	}

sub detailed_citation_preview {	sub detailed_citation_preview {
my ($prefix,%values)=@_;	my ($prefix,%values)=@_;
return '<table><tr><td>'.	return &detailed_citation_view($prefix,%values).
&detailed_citation_view($prefix,%values).
'</td><td>'.	'</td><td>'.
&Apache::lonindexer::showpreview($values{'url'}).	&Apache::lonindexer::showpreview($values{'url'});
'</td></tr></table><hr />';
}	}


Line 3502 sub detailed_citation_preview {	Line 3478 sub detailed_citation_preview {
sub summary_view {	sub summary_view {
my ($prefix,%values) = @_;	my ($prefix,%values) = @_;
my $icon=&Apache::loncommon::icon($values{'url'});	my $icon=&Apache::loncommon::icon($values{'url'});
my $result=qq{$prefix<img src="$icon" />};	my $result=qq{$prefix<img src="$icon" alt="" />};
if (exists($env{'form.sortfield'}) &&	if (exists($env{'form.sortfield'}) &&
$env{'form.sortfield'} !~ /^(default\|	$env{'form.sortfield'} !~ /^(default\|
author\|	author\|
Line 3517 sub summary_view {	Line 3493 sub summary_view {
}	}
my $jumpurl=$values{'url'};	my $jumpurl=$values{'url'};
$jumpurl=~s\|^/ext/\|http://\|;	$jumpurl=~s\|^/ext/\|http://\|;
my $link = &display_url($jumpurl,[2,0,1]);	my $link = '<br />'.&display_url($jumpurl,1).'<br />';
	$result .=
$result.=<<END;	'<a href="'.$jumpurl.'?inhibitmenu=yes"'.
<a href="$jumpurl?inhibitmenu=yes"	' target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}.'</a>'.
target='preview'>$values{'title'}</a> <br />	&display_tools($values{'title'}, $jumpurl).<<END;
$link <br />	<br />
	$link<br />
$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />	$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
$values{'copyrighttag'}<br />	$values{'copyrighttag'}<br />
$values{'extrashow'}	$values{'extrashow'}
</p>
<hr align='left' width='200' noshade />
END	END
return $result;	return $result;
}	}

sub summary_preview {	sub summary_preview {
my ($prefix,%values)=@_;	my ($prefix,%values)=@_;
return '<table><tr><td>'.	return &summary_view($prefix,%values).
&summary_view($prefix,%values).
'</td><td>'.	'</td><td>'.
&Apache::lonindexer::showpreview($values{'url'}).	&Apache::lonindexer::showpreview($values{'url'});
'</td></tr></table><hr />';
}	}

######################################################################	######################################################################
Line 3557 sub compact_view {	Line 3530 sub compact_view {
my $jumpurl=$values{'url'};	my $jumpurl=$values{'url'};
$jumpurl=~s\|^/ext/\|http://\|;	$jumpurl=~s\|^/ext/\|http://\|;

my $link = &display_url($jumpurl,[1,1,1]);	my $link = &display_url($jumpurl,1);

my $result =	my $result =
$prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';	$prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />';
if (exists($env{'form.sortfield'}) &&	if (exists($env{'form.sortfield'}) &&
$env{'form.sortfield'} !~ /^(default\|author\|url\|title)$/) {	$env{'form.sortfield'} !~ /^(default\|author\|url\|title)$/) {
my $tmp = $values{$env{'form.sortfield'}};	my $tmp = $values{$env{'form.sortfield'}};
Line 3569 sub compact_view {	Line 3542 sub compact_view {
}	}
$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');	$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
$result.=' <span class="LC_nobreak">'.	$result.=' <span class="LC_nobreak">'.
'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.
&HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.	&HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';	&display_tools($values{'title'}, $jumpurl).
	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';
return $result;	return $result;
}	}

sub display_url {	sub display_url {
my ($url,$crumb_args) = @_;	my ($url,$skiplast) = @_;
my $link;	my $link;
if ($url=~m\|^/ext/\|) {	if ($url=~m\|^/ext/\|) {
$url=~s\|^/ext/\|http://\|;	$url=~s\|^/ext/\|http://\|;
Line 3584 sub display_url {	Line 3558 sub display_url {
} elsif ($url=~m{^(http://\|/uploaded/)}) {	} elsif ($url=~m{^(http://\|/uploaded/)}) {
$link='<span class="LC_filename">'.$url.'</span>';	$link='<span class="LC_filename">'.$url.'</span>';
} else {	} else {
$link=&Apache::lonhtmlcommon::crumbs($url,	# replace the links to open in a new window
'preview',	# (because the search opens in a new window, it gets
'',	# confusing when the links open a tab in the
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),@{$crumb_args}).' ';	# parent window; ideally we should not force windows)
	my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\"";
	$link=&Apache::lonhtmlcommon::crumbs(
	$url,
	'preview',
	'',
	'',
	$skiplast,$onclick).' ';
}	}
return $link;	return $link;
}	}
Line 3611 sub fielded_format_view {	Line 3592 sub fielded_format_view {
$jumpurl=~s\|^/ext/\|http://\|;	$jumpurl=~s\|^/ext/\|http://\|;

my $result=<<END;	my $result=<<END;
$prefix <img src="$icon" />	$prefix <img src="$icon" alt="" />
<dl>	<dl>
<dt>URL:</dt>	<dt>URL:</dt>
<dd><a href="$jumpurl?inhibitmenu=yes"	<dd><a href="$jumpurl?inhibitmenu=yes"
target='preview'>$values{'url'}</a></dd>	target='preview'>$values{'url'}</a>
END	END
	$result .=
	&display_tools($values{'title'}, $jumpurl).'
	</dd>';
foreach my $field ('title','author','domain','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') {
Line 3637 END	Line 3621 END
}	}
$result .= "</dl>\n";	$result .= "</dl>\n";
$result .= $values{'extrashow'};	$result .= $values{'extrashow'};
$result .= '<hr align="left" width="200" noshade />'."\n";
return $result;	return $result;
}	}

Line 3711 $prefix	Line 3694 $prefix
$xml	$xml
</pre>	</pre>
$values{'extrashow'}	$values{'extrashow'}
<hr align='left' width='200' noshade />
END	END
return $result;	return $result;
}	}
Line 3751 sub output_unparsed_phrase_error {	Line 3733 sub output_unparsed_phrase_error {
my ($r,$closebutton,$parms,$hidden_fields,$field)=@_;	my ($r,$closebutton,$parms,$hidden_fields,$field)=@_;
my $errorstring;	my $errorstring;
if ($field eq 'basicexp') {	if ($field eq 'basicexp') {
$errorstring = &mt('Unable to understand the search phrase <i>[_1]</i>. Please modify your search.',$env{'form.basicexp'});	$errorstring = &mt('Unable to understand the search phrase [_1]. Please modify your search.'
	,'<i>'.$env{'form.basicexp'}.'</i>');
} else {	} else {
$errorstring = &mt('Unable to understand the search phrase <b>[_1]</b>:<i>[_2]</i>.',$field,$env{'form.'.$field});	$errorstring = &mt('Unable to understand the search phrase [_1]: [_2]'
	,'<i>'.$field.'</i>'
	,$env{'form.'.$field});
}	}
my $heading = &mt('Unparsed Field');	my $heading = &mt('Unparsed Field');
my $revise = &mt('Revise search request');	my $revise = &mt('Revise search request');
Line 3767 $hidden_fields	Line 3752 $hidden_fields
$closebutton	$closebutton
<hr />	<hr />
<h2>$heading</h2>	<h2>$heading</h2>
<p>	<p class="LC_warning">
$errorstring	$errorstring
</p>	</p>
<p>	<p>
<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>	<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
</p>	</p>
$end_page	$end_page
ENDPAGE	ENDPAGE
Line 3799 $parms is extra information to include i	Line 3784 $parms is extra information to include i
######################################################################	######################################################################
sub output_blank_field_error {	sub output_blank_field_error {
my ($r,$closebutton,$parms,$hidden_fields)=@_;	my ($r,$closebutton,$parms,$hidden_fields)=@_;
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 Query');
my $start_page = &Apache::loncommon::start_page('Search');	my $start_page = &Apache::loncommon::start_page('Search');
my $end_page = &Apache::loncommon::end_page();	my $end_page = &Apache::loncommon::end_page();
	if ($closebutton) {
	$closebutton = '<p>'.$closebutton.'</p><hr />';
	} else {
	&Apache::lonhtmlcommon::add_breadcrumb
	({href=>'',
	text=>$heading,});
	$start_page .= &Apache::lonhtmlcommon::breadcrumbs();
	}

$r->print(<<ENDPAGE);	$r->print(<<ENDPAGE);
$start_page	$start_page
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
$hidden_fields	$hidden_fields
$closebutton	$closebutton
<hr />	</form>
<h2>$heading</h2>	<h2>$heading</h2>
<p>	<p class="LC_warning">
$errormsg	$errormsg
</p>	</p>
<p>	<p>
<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>	<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
</p>	</p>
$end_page	$end_page
ENDPAGE	ENDPAGE
Line 3846 sub output_date_error {	Line 3840 sub output_date_error {
# make query information persistent to allow for subsequent revision	# make query information persistent to allow for subsequent revision
my $start_page = &Apache::loncommon::start_page('Search');	my $start_page = &Apache::loncommon::start_page('Search');
my $end_page = &Apache::loncommon::end_page();	my $end_page = &Apache::loncommon::end_page();
	my $heading = &mt('Error');
$r->print(<<RESULTS);	$r->print(<<RESULTS);
$start_page	$start_page
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
$hidden_fields	$hidden_fields
<input type='button' value='Revise search request'	<input type='button' value='Revise search request'
onClick='this.form.submit();' />	onclick='this.form.submit();' />
$closebutton	$closebutton
	</form>
<hr />	<hr />
<h3>Error</h3>	<h3>$heading</h3>
<p>	<p class="LC_error">
$message	$message
</p>	</p>
$end_page	$end_page
Line 3878 Cleans the global %groupsearch_db by rem	Line 3874 Cleans the global %groupsearch_db by rem
######################################################################	######################################################################
sub start_fresh_session {	sub start_fresh_session {
delete $groupsearch_db{'mode_catalog'};	delete $groupsearch_db{'mode_catalog'};
foreach (keys %groupsearch_db) {	foreach (keys(%groupsearch_db)) {
if ($_ =~ /^pre_/) {	if ($_ =~ /^pre_/) {
delete $groupsearch_db{$_};	delete $groupsearch_db{$_};
}	}
Line 3896 sub cleanup {	Line 3892 sub cleanup {
&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');	&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');
}	}
}	}
&untiehash();
&Apache::lonmysql::disconnect_from_db();	&Apache::lonmysql::disconnect_from_db();
return OK;	return OK;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.291
changed lines
	Added in v.1.352