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.156 and 1.194

version 1.156, 2002/09/16 12:52:33	version 1.194, 2003/12/11 20:59:54
Line 74 package Apache::lonsearchcat;	Line 74 package Apache::lonsearchcat;

# ------------------------------------------------- modules used by this module	# ------------------------------------------------- modules used by this module
use strict;	use strict;
use Apache::Constants qw(:common);	use Apache::Constants qw(:common :http);
use Apache::lonnet();	use Apache::lonnet();
use Apache::File();	use Apache::File();
use CGI qw(:standard);	use CGI qw(:standard);
use Text::Query;	use Text::Query;
use DBI;
use GDBM_File;	use GDBM_File;
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonmysql();	use Apache::lonmysql();
	use Apache::lonlocal;

# ---------------------------------------- variables used throughout the module	# ---------------------------------------- variables used throughout the module

Line 143 my %persistent_db;	Line 143 my %persistent_db;
my $hidden_fields;	my $hidden_fields;
my $bodytag;	my $bodytag;

	#
	# For course search
	#
	my %alreadyseen;
	my $hashtied;
	my %hash;
	my $totalfound;

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

Line 171 string that holds portions of the screen	Line 179 string that holds portions of the screen
sub handler {	sub handler {
my $r = shift;	my $r = shift;
#	#

	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
# normal invocation.	# normal invocation.
#	#
$r->content_type('text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
return OK if $r->header_only;	return OK if $r->header_only;
##	##
Line 187 sub handler {	Line 199 sub handler {
##	##
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['catalogmode','launch','acts','mode','form','element','pause',	['catalogmode','launch','acts','mode','form','element','pause',
'phase','persistent_db_id','table','start','show']);	'phase','persistent_db_id','table','start','show',
	'cleargroupsort','titleelement']);
##	##
## The following is a trick - we wait a few seconds if asked to so	## The following is a trick - we wait a few seconds if asked to so
## the daemon running the search can get ahead of the daemon	## the daemon running the search can get ahead of the daemon
Line 195 sub handler {	Line 208 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(3);	sleep(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/".&Apache::lonnet::escape($domain).	$diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
"\_".&Apache::lonnet::escape($ENV{'user.name'})."_searchcat.db";
#	#
# set the name of the persistent database	# set the name of the persistent database
# $ENV{'form.persistent_db_id'} can only have digits in it.	# $ENV{'form.persistent_db_id'} can only have digits in it.
Line 238 END	Line 250 END
## Clear out old values from groupsearch database	## Clear out old values from groupsearch database
##	##
untie %groupsearch_db if (tied(%groupsearch_db));	untie %groupsearch_db if (tied(%groupsearch_db));
if (($ENV{'form.launch'} eq '1') &&	if (($ENV{'form.cleargroupsort'} eq '1') \|\|
($ENV{'form.catalogmode'} eq 'groupsearch')) {	(($ENV{'form.launch'} eq '1') &&
	($ENV{'form.catalogmode'} eq 'groupsearch'))) {
if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
&start_fresh_session();	&start_fresh_session();
untie %groupsearch_db;	untie %groupsearch_db;
	delete($ENV{'form.cleargroupsort'});
} else {	} else {
# This is a stupid error to give to the user.	# This is a stupid error to give to the user.
# It really tells them nothing.	# It really tells them nothing.
Line 268 END	Line 282 END
$hidden_fields .= '<input type="hidden" name="element" value="'.	$hidden_fields .= '<input type="hidden" name="element" value="'.
$ENV{'form.element'}.'" />'."\n";	$ENV{'form.element'}.'" />'."\n";
}	}
	if (exists($ENV{'form.titleelement'})) {
	$hidden_fields .= '<input type="hidden" name="titleelement" value="'.
	$ENV{'form.titleelement'}.'" />'."\n";
	}
if (exists($ENV{'form.mode'})) {	if (exists($ENV{'form.mode'})) {
$hidden_fields .= '<input type="hidden" name="mode" value="'.	$hidden_fields .= '<input type="hidden" name="mode" value="'.
$ENV{'form.mode'}.'" />'."\n";	$ENV{'form.mode'}.'" />'."\n";
Line 332 END	Line 350 END
&run_search($r,$query,$customquery,$customshow,	&run_search($r,$query,$customquery,$customshow,
$libraries,$pretty_string);	$libraries,$pretty_string);
}	}
	} 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')) {
$ENV{'form.searchmode'} = 'basic';	$ENV{'form.searchmode'} = 'basic';
Line 367 END	Line 387 END
(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) = &parse_basic_search($r,$closebutton);	($query,$pretty_string,$libraries) =
	&parse_basic_search($r,$closebutton);
} else { # Advanced search	} else { # Advanced search
($query,$customquery,$customshow,$libraries,$pretty_string)	($query,$customquery,$customshow,$libraries,$pretty_string)
= &parse_advanced_search($r,$closebutton);	= &parse_advanced_search($r,$closebutton);
Line 390 END	Line 411 END
######################################################################	######################################################################
######################################################################	######################################################################

	sub course_search {
	my $r=shift;
	my $bodytag=&Apache::loncommon::bodytag('Course Search');
	my $pretty_search_string = '<b>'.$ENV{'form.courseexp'}.'</b>';
	my $search_string = $ENV{'form.courseexp'};
	my @New_Words;
	if ($ENV{'form.crsrelated'}) {
	($search_string,@New_Words) = &related_version($ENV{'form.courseexp'});
	if (@New_Words) {
	$pretty_search_string .= " with related words: <b>@New_Words</b>.";
	} else {
	$pretty_search_string .= " with no related words.";
	}
	}
	my $fulltext=$ENV{'form.crsfulltext'};
	my @allwords=($search_string,@New_Words);
	$totalfound=0;
	$r->print('<html><head><title>LON-CAPA Course Search</title></head>'.
	$bodytag.$pretty_search_string);
	$r->rflush();
	# ======================================================= Go through the course
	$hashtied=0;
	undef %alreadyseen;
	%alreadyseen=();
	my $c=$r->connection;
	&tiehash();
	foreach (keys %hash) {
	if ($c->aborted()) { last; }
	if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
	&checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,@allwords);
	}
	}
	&untiehash();
	unless ($totalfound) {
	$r->print('<p>'.&mt('No resources found').'.</p>');
	}
	# =================================================== Done going through course
	$r->print('</body></html>');
	}

	# ---------------------------------------------------------------- tie the hash

	sub tiehash {
	$hashtied=0;
	if ($ENV{'request.course.fn'}) {
	if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
	&GDBM_READER(),0640)) {
	$hashtied=1;
	}
	}
	}

	sub untiehash {
	if ($hashtied) { untie %hash; }
	$hashtied=0;
	}

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

	sub checkonthis {
	my ($r,$url,$level,$title,$fulltext,@allwords)=@_;
	$alreadyseen{$url}=1;
	$r->rflush();
	my $result=&Apache::lonnet::metadata($url,'title').' '.
	&Apache::lonnet::metadata($url,'subject').' '.
	&Apache::lonnet::metadata($url,'abstract').' '.
	&Apache::lonnet::metadata($url,'keywords');
	if (($url) && ($fulltext)) {
	$result.=&Apache::lonnet::ssi_body($url);
	}
	$result=~s/\s+/ /gs;
	my $applies=0;
	foreach (@allwords) {
	if ($_=~/\w/) {
	if ($result=~/$_/si) {
	$applies++;
	}
	}
	}
	# Does this resource apply?
	if ($applies) {
	$r->print('<br />');
	for (my $i=0;$i<=$level*5;$i++) {
	$r->print(' ');
	}
	$r->print('<a href="'.$url.'" 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{$_})) {
	&checkonthis($r,$_,$level+1,'',$fulltext,@allwords);
	}
	}
	}

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

=pod	=pod

=item &print_basic_search_form()	=item &print_basic_search_form()
Line 403 Returns a scalar which holds html for th	Line 529 Returns a scalar which holds html for th

sub print_basic_search_form{	sub print_basic_search_form{
my ($r,$closebutton) = @_;	my ($r,$closebutton) = @_;
my $bodytag=&Apache::loncommon::bodytag('Catalog Search');	my $bodytag=&Apache::loncommon::bodytag('Search');
my $scrout=<<"ENDDOCUMENT";	my $scrout=<<"ENDDOCUMENT";
<html>	<html>
<head>	<head>
Line 417 sub print_basic_search_form{	Line 543 sub print_basic_search_form{
</script>	</script>
</head>	</head>
$bodytag	$bodytag
	ENDDOCUMENT
	if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
	my $CatalogSearch=&mt('Catalog Search');
	my $Statement=&mt('Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below');
	$scrout.=(<<ENDDOCUMENT);
	<h1>$CatalogSearch</h1>
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
<input type="hidden" name="phase" value="basic_search" />	<input type="hidden" name="phase" value="basic_search" />
$hidden_fields	$hidden_fields
<p>	<p>
Enter terms or phrases separated by AND, OR, or NOT	$Statement.
then press SEARCH below.
</p>	</p>
<p>	<p>
<table>	<table>
Line 430 then press SEARCH below.	Line 561 then press SEARCH below.
ENDDOCUMENT	ENDDOCUMENT
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).	$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).
' ';	' ';
my $checkbox = &simplecheckbox('related',$ENV{'form.related'});	my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'});
	my $domain = $r->dir_config('lonDefDomain');
	my $domaincheckbox = &simplecheckbox('domains',$domain);
	my $srch=&mt('Search');
	my $header=&mt('Advanced Search');
	my $userelatedwords=&mt('use related words');
	my $onlysearchdomain=&mt('only search domain');
$scrout.=<<END;	$scrout.=<<END;
</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr>	</td><td><a
<tr><td>$checkbox use related words</td><td></td></tr>	href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}"
	>$header</a></td></tr>
	<tr><td>$relatedcheckbox $userelatedwords</td>
	<td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr>
</table>	</table>
</p>	</p>
<p>	<p>
<input type="submit" name="basicsubmit" value='SEARCH' />	<input type="submit" name="basicsubmit" value='$srch' />
$closebutton	$closebutton
END	END
$scrout.=&selectbox(undef,'viewselect',	$scrout.=&selectbox('View','viewselect',
$ENV{'form.viewselect'},	$ENV{'form.viewselect'},
undef,undef,undef,	undef,undef,undef,
sort(keys(%Views)));	sort(keys(%Views)));
$scrout.=&selectbox(undef,'show',	$scrout.=&selectbox('Per Page','show',
$ENV{'form.show'},	$ENV{'form.show'},
undef,undef,undef,	undef,undef,undef,
(10,20,50,100));	(10,20,50,100));
$scrout.=<<ENDDOCUMENT;	$scrout.=<<ENDDOCUMENT;
per page.
</p>	</p>
</form>	</form>
	ENDDOCUMENT
	}
	if ($ENV{'request.course.id'}) {
	my %lt=&Apache::lonlocal::texthash(
	'srch' => 'Search',
	'header' => 'Course Search',
	'note' => 'Enter terms or phrases, then press "Search" below',
	);
	$scrout.=(<<ENDCOURSESEARCH);
	<hr />
	<h1>$lt{'header'}</h1>
	<form method="post" action="/adm/searchcat">
	<input type="hidden" name="phase" value="course_search" />
	$hidden_fields
	<p>
	$lt{'note'}.
	</p>
	<p>
	<table>
	<tr><td>
	ENDCOURSESEARCH
	$scrout.=' '.
	&simpletextfield('courseexp',$ENV{'form.courseexp'},40);
	my $crscheckbox =
	&simplecheckbox('crsfulltext',$ENV{'form.crsfulltext'});
	my $relcheckbox =
	&simplecheckbox('crsrelated',$ENV{'form.crsrelated'});
	$scrout.=(<<ENDENDCOURSE);
	</td></tr>
	<tr><td>$relcheckbox use related words</td><td></td></tr>
	<tr><td>$crscheckbox fulltext search (time consuming)</td><td></td></tr>
	</table><p>
	<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
	</p>
	ENDENDCOURSE
	}
	$scrout.=(<<ENDDOCUMENT);
</body>	</body>
</html>	</html>
ENDDOCUMENT	ENDDOCUMENT
Line 519 ENDHEADER	Line 695 ENDHEADER
undef,undef,undef,	undef,undef,undef,
(10,20,50,100));	(10,20,50,100));
$scrout.=' '.	$scrout.=' '.
'<font color="#800000" face="helvetica">Per Page</font>';	'<font color="#800000" face="helvetica">'.&mt('Per Page').'</font>';
$scrout.="</td><td>Related<br />Words</td></tr>\n";	$scrout.="</td><td>".&mt('Related').'<br />'.&mt('Words')."</td></tr>\n";
$scrout.=&searchphrasefield_with_related('title', 'title' ,	$scrout.=&searchphrasefield_with_related('title', 'title' ,
$ENV{'form.title'});	$ENV{'form.title'});
$scrout.=&searchphrasefield('author', 'author' ,$ENV{'form.author'});	$scrout.=&searchphrasefield('author', 'author' ,$ENV{'form.author'});
Line 535 ENDHEADER	Line 711 ENDHEADER
$ENV{'form.abstract'});	$ENV{'form.abstract'});
# Hack - an empty table row.	# Hack - an empty table row.
$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";	$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";
$scrout.=&searchphrasefield('file<br />extension','mime',	$scrout.=&searchphrasefield('file<br />extension','extension',
$ENV{'form.mime'});	$ENV{'form.extension'});
$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";	$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";
$scrout.=&searchphrasefield('publisher<br />owner','owner',	$scrout.=&searchphrasefield('publisher<br />owner','owner',
$ENV{'form.owner'});	$ENV{'form.owner'});
$scrout.="</table>\n";	$scrout.="</table>\n";
$ENV{'form.category'}='any' unless length($ENV{'form.category'});	$ENV{'form.category'}='any' if (! defined($ENV{'form.category'}));
$scrout.=&selectbox('File Category','category',	$scrout.=&selectbox('File Category','category',
$ENV{'form.category'},	$ENV{'form.category'},
'any','Any category',	'any','Any category',
Line 562 ENDHEADER	Line 738 ENDHEADER
my @domains =&Apache::loncommon::get_domains();	my @domains =&Apache::loncommon::get_domains();
# adjust the size of the select box	# adjust the size of the select box
my $size = 4;	my $size = 4;
my $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);	$size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
$scrout.="\n".'<font color="#800000" face="helvetica"><b>'.	$scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
'DOMAINS</b></font><br />'.	'DOMAINS TO BE SEARCHED</b></font><br />'.
'<select name="domains" size="'.$size.'" multiple>'."\n".	'<select name="domains" size="'.$size.'" multiple>'."\n".
'<option name="any" value="any" '.	'<option name="any" value="any" '.
($domain_hash{'any'}? 'selected ' :'').	($domain_hash{'any'}? 'selected ' :'').
Line 577 ENDHEADER	Line 753 ENDHEADER
#----------------------------------------------------------------	#----------------------------------------------------------------
$scrout.=&selectbox('Limit by language','language',	$scrout.=&selectbox('Limit by language','language',
$ENV{'form.language'},'any','Any Language',	$ENV{'form.language'},'any','Any Language',
\&{Apache::loncommon::languagedescription},	\&Apache::loncommon::languagedescription,
(&Apache::loncommon::languageids),	(&Apache::loncommon::languageids),
);	);
# ------------------------------------------------ Compute date selection boxes	# ------------------------------------------------ Compute date selection boxes
Line 624 LASTREVISIONDATEEND	Line 800 LASTREVISIONDATEEND
$scrout.=&selectbox('Limit by copyright/distribution','copyright',	$scrout.=&selectbox('Limit by copyright/distribution','copyright',
$ENV{'form.copyright'},	$ENV{'form.copyright'},
'any','Any copyright/distribution',	'any','Any copyright/distribution',
\&{Apache::loncommon::copyrightdescription},	\&Apache::loncommon::copyrightdescription,
(&Apache::loncommon::copyrightids),	(&Apache::loncommon::copyrightids),
);	);
# ------------------------------------------- Compute customized metadata field	# ------------------------------------------- Compute customized metadata field
Line 685 sub get_persistent_form_data {	Line 861 sub get_persistent_form_data {
&GDBM_READER(),0640));	&GDBM_READER(),0640));
#	#
# These make sure we do not get array references printed out as 'values'.	# These make sure we do not get array references printed out as 'values'.
my %arrays_allowed = ('form.category'=>1,'form.domains'=>1);	my %arrays_allowed = ('form.domains'=>1);
#	#
# Loop through the keys, looking for 'form.'	# Loop through the keys, looking for 'form.'
foreach my $name (keys(%persistent_db)) {	foreach my $name (keys(%persistent_db)) {
next if ($name !~ /^form./);	next if ($name !~ /^form./);
	# Kludgification begins!
	if ($name eq 'form.domains' &&
	$ENV{'form.searchmode'} eq 'basic' &&
	$ENV{'form.phase'} ne 'disp_basic') {
	next;
	}
	# End kludge (hopefully)
next if (exists($ENV{$name}));	next if (exists($ENV{$name}));
my @values = map {	my @values = map {
&Apache::lonnet::unescape($_);	&Apache::lonnet::unescape($_);
Line 704 sub get_persistent_form_data {	Line 887 sub get_persistent_form_data {
untie (%persistent_db);	untie (%persistent_db);
return 1;	return 1;
}	}

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

Line 862 If $value eq 'on' the box is checked.	Line 1046 If $value eq 'on' the box is checked.
###############################################	###############################################
###############################################	###############################################

sub simplecheckbox {	sub simplecheckbox{
my ($name,$value)=@_;	my ($name,$value,$checked)=@_;
my $checked='';	$checked="checked" if ($value eq 'on');
$checked="checked" if $value eq 'on';	return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '.
return '<input type="checkbox" name="'.$name.'" '. $checked . ' />';	$checked.' />';
}	}

###############################################	###############################################
Line 887 field heading.	Line 1071 field heading.
###############################################	###############################################

sub fieldtitle {	sub fieldtitle {
my $title = uc(shift());	my $title = uc(&mt(shift()));
return '<font color="#800000" face="helvetica"><b>'.$title.	return '<font color="#800000" face="helvetica"><b>'.$title.
': </b></font>';	': </b></font>';
}	}
Line 982 END	Line 1166 END
my $i = 1;	my $i = 1;
foreach (qw/January February March April May June	foreach (qw/January February March April May June
July August September October November December /){	July August September October November December /){
$month .="<option value=\"$i\">$_</option>\n";	$month .="<option value=\"$i\">".&mt($_)."</option>\n";
$i++;	$i++;
}	}
$month.="</select>\n";	$month.="</select>\n";
Line 1059 sub selectbox {	Line 1243 sub selectbox {
my ($title,$name,$default,$anyvalue,$anytag,$functionref,@idlist)=@_;	my ($title,$name,$default,$anyvalue,$anytag,$functionref,@idlist)=@_;
if (! defined($functionref)) { $functionref = sub { $_[0]}; }	if (! defined($functionref)) { $functionref = sub { $_[0]}; }
my $selout='';	my $selout='';
	$title=&mt($title);
if (defined($title)) {	if (defined($title)) {
my $uctitle=uc($title);	my $uctitle=uc($title);
$selout="\n".'<p><font color="#800000" face="helvetica">'.	$selout="\n".'<p><font color="#800000" face="helvetica">'.
Line 1069 sub selectbox {	Line 1254 sub selectbox {
foreach (@idlist) {	foreach (@idlist) {
$selout.='<option value="'.$_.'"';	$selout.='<option value="'.$_.'"';
if ($_ eq $default and !/^any$/) {	if ($_ eq $default and !/^any$/) {
$selout.=' selected >'.&{$functionref}($_).'</option>';	$selout.=' selected >'.&mt(&{$functionref}($_)).'</option>';
}	}
elsif ($_ eq $default and /^$anyvalue$/) {	elsif ($_ eq $default and /^$anyvalue$/) {
$selout.=' selected >'.$anytag.'</option>';	$selout.=' selected >'.&mt($anytag).'</option>';
}	}
else {$selout.='>'.&{$functionref}($_).'</option>';}	else {$selout.='>'.&mt(&{$functionref}($_)).'</option>';}
}	}
return $selout.'</select>'.(defined($title)?'</p>':' ');	return $selout.'</select>'.(defined($title)?'</p>':' ');
}	}
Line 1127 sub parse_advanced_search {	Line 1312 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',
'notes','abstract','mime','language','owner',	'notes','abstract','extension','language','owner',
'custommetadata','customshow','category') {	'custommetadata','customshow','category') {
$ENV{"form.$field"}=~s/[^\w\/\s\=\-\"\']//g;	$ENV{"form.$field"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
Line 1138 sub parse_advanced_search {	Line 1323 sub parse_advanced_search {
$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;	$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
# Preprocess the category form element.	# Preprocess the category form element.
$ENV{'form.category'} = 'any' if (ref($ENV{'form.category'}));	$ENV{'form.category'} = 'any' if (! defined($ENV{'form.category'}) \|\|
if ($ENV{'form.category'} ne 'any') {	ref($ENV{'form.category'}));
my @extensions = &Apache::loncommon::filecategorytypes	#
($ENV{'form.category'});
$ENV{'form.mime'} = join ' OR ',@extensions;
}
# Check to see if enough information was filled in	# Check to see if enough information was filled in
for my $field ('title','author','subject','keywords','url','version',	for my $field ('title','author','subject','keywords','url','version',
'notes','abstract','mime','language','owner',	'notes','abstract','category','extension','language',
'custommetadata') {	'owner','custommetadata') {
if (&filled($ENV{"form.$field"})) {	if (&filled($ENV{"form.$field"})) {
$fillflag++;	$fillflag++;
}	}
Line 1162 sub parse_advanced_search {	Line 1344 sub parse_advanced_search {
my $font = '<font color="#800000" face="helvetica">';	my $font = '<font color="#800000" face="helvetica">';
# Evaluate logical expression AND/OR/NOT phrase fields.	# Evaluate logical expression AND/OR/NOT phrase fields.
foreach my $field ('title','author','subject','notes','abstract','url',	foreach my $field ('title','author','subject','notes','abstract','url',
'keywords','version','owner','mime') {	'keywords','version','owner') {
if ($ENV{'form.'.$field}) {	if ($ENV{'form.'.$field}) {
my $searchphrase = $ENV{'form.'.$field};	my $searchphrase = $ENV{'form.'.$field};
$pretty_search_string .= $font."$field</font> contains <b>".	$pretty_search_string .= $font."$field</font> contains <b>".
Line 1181 sub parse_advanced_search {	Line 1363 sub parse_advanced_search {
push @queries,&build_SQL_query($field,$searchphrase);	push @queries,&build_SQL_query($field,$searchphrase);
}	}
}	}
# I dislike the hack below.	#
if ($ENV{'form.category'}) {	# Make the 'mime' from 'form.category' and 'form.extension'
$ENV{'form.mime'}='';	#
	my $searchphrase;
	if (exists($ENV{'form.category'}) &&
	$ENV{'form.category'} !~ /^\s*$/ &&
	$ENV{'form.category'} ne 'any') {
	my @extensions = &Apache::loncommon::filecategorytypes
	($ENV{'form.category'});
	if (scalar(@extensions) > 0) {
	$searchphrase = join(' OR ',@extensions);
	}
	}
	if (exists($ENV{'form.extension'}) && $ENV{'form.extension'} !~ /^\s*$/) {
	$searchphrase .= ' OR ' if (defined($searchphrase));
	my @extensions = split(/,/,$ENV{'form.extension'});
	$searchphrase .= join(' OR ',@extensions);
	}
	if (defined($searchphrase)) {
	push @queries,&build_SQL_query('mime',$searchphrase);
	$pretty_search_string .=$font.'mime</font> contains <b>'.
	$searchphrase.'</b><br />';
}	}
	#####
# Evaluate option lists	# Evaluate option lists
if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {	if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
push @queries,"(language like \"$ENV{'form.language'}\")";	push @queries,"(language like \"$ENV{'form.language'}\")";
Line 1243 sub parse_advanced_search {	Line 1445 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();
	$pretty_search_string .= $pretty_domains_string."<br />\n";
	#
	if (@queries) {
	$query=join(" AND ",@queries);
	$query="select * from metadata where $query";
	} elsif ($customquery) {
	$query = '';
	}
	return ($query,$customquery,$customshow,$libraries_to_query,
	$pretty_search_string);
	}

	sub parse_domain_restrictions {
my $libraries_to_query = undef;	my $libraries_to_query = undef;
# $ENV{'form.domains'} can be either a scalar or an array reference.	# $ENV{'form.domains'} can be either a scalar or an array reference.
# We need an array.	# We need an array.
my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}}	if (! exists($ENV{'form.domains'})) {
: ($ENV{'form.domains'}) );	return (undef,'');
	}
	my @allowed_domains;
	if (ref($ENV{'form.domains'})) {
	@allowed_domains = @{$ENV{'form.domains'}};
	} else {
	@allowed_domains = ($ENV{'form.domains'});
	}
my %domain_hash = ();	my %domain_hash = ();
my $pretty_domains_string;	my $pretty_domains_string;
foreach (@allowed_domains) {	foreach (@allowed_domains) {
Line 1270 sub parse_advanced_search {	Line 1494 sub parse_advanced_search {
}	}
}	}
}	}
$pretty_search_string .= $pretty_domains_string."<br />\n";	return ($libraries_to_query,$pretty_domains_string);
#
if (@queries) {
$query=join(" AND ",@queries);
$query="select * from metadata where $query";
} elsif ($customquery) {
$query = '';
}
return ($query,$customquery,$customshow,$libraries_to_query,
$pretty_search_string);
}	}

######################################################################	######################################################################
Line 1307 sub parse_basic_search {	Line 1522 sub parse_basic_search {
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});	$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;	$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
	my ($libraries_to_query,$pretty_domains_string) =
	&parse_domain_restrictions();
# Check to see if enough is filled in	# Check to see if enough is filled in
unless (&filled($ENV{'form.basicexp'})) {	unless (&filled($ENV{'form.basicexp'})) {
&output_blank_field_error($r,$closebutton,'phase=disp_basic');	&output_blank_field_error($r,$closebutton,'phase=disp_basic');
Line 1326 sub parse_basic_search {	Line 1542 sub parse_basic_search {
}	}
# Build SQL query string based on form page	# Build SQL query string based on form page
my $query='';	my $query='';
my $concatarg=join('," ",',	my $concatarg=join(',',
('title', 'author', 'subject', 'notes', 'abstract',	('title', 'author', 'subject', 'notes', 'abstract',
'keywords'));	'keywords'));
$concatarg='title' if $ENV{'form.titleonly'};	$concatarg='title' if $ENV{'form.titleonly'};
$query=&build_SQL_query('concat('.$concatarg.')',$search_string);	$query=&build_SQL_query('concat_ws(" ",'.$concatarg.')',$search_string);
	if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
	$pretty_search_string .= ' '.$pretty_domains_string;
	}
$pretty_search_string .= "<br />\n";	$pretty_search_string .= "<br />\n";
return 'select * from metadata where '.$query,$pretty_search_string;	my $final_query = 'SELECT * FROM metadata WHERE '.$query;
	# &Apache::lonnet::logthis($final_query);
	return ($final_query,$pretty_search_string,
	$libraries_to_query);
}	}


Line 1445 sub recursive_SQL_query_build {	Line 1667 sub recursive_SQL_query_build {
my @matches=($pattern=~/(\[[^\]\|\[]*\])/g);	my @matches=($pattern=~/(\[[^\]\|\[]*\])/g);
return $pattern unless @matches;	return $pattern unless @matches;
foreach my $match (@matches) {	foreach my $match (@matches) {
$match=~/\[ (\w+)\s(.*) \]/;	$match=~/\[ (\w+)\s(.*) \]/;
my ($key,$value)=($1,$2);	my ($key,$value)=($1,$2);
my $replacement='';	my $replacement='';
if ($key eq 'literal') {	if ($key eq 'literal') {
$replacement="($dkey like \"\%$value\%\")";	$replacement="($dkey LIKE \"\%$value\%\")";
}	} elsif (lc($key) eq 'not') {
elsif ($key eq 'not') {	$value=~s/LIKE/NOT LIKE/;
$value=~s/like/not like/;	# $replacement="($dkey not like $value)";
# $replacement="($dkey not like $value)";	$replacement="$value";
$replacement="$value";	} elsif ($key eq 'and') {
}	$value=~/(.[\"\|\)]) ([\|\(\|\^].)/;
elsif ($key eq 'and') {	$replacement="($1 AND $2)";
$value=~/(.[\"\|\)]) ([\|\(\|\^].)/;	} elsif ($key eq 'or') {
$replacement="($1 AND $2)";	$value=~/(.[\"\|\)]) ([\|\(\|\^].)/;
}	$replacement="($1 OR $2)";
elsif ($key eq 'or') {
$value=~/(.[\"\|\)]) ([\|\(\|\^].)/;
$replacement="($1 OR $2)";
}	}
substr($pattern,	substr($pattern,
index($pattern,$match),	index($pattern,$match),
length($match),	length($match),
$replacement	$replacement);
);
}	}
&recursive_SQL_query_build($dkey,$pattern);	&recursive_SQL_query_build($dkey,$pattern);
}	}
Line 1636 sub ensure_db_and_table {	Line 1854 sub ensure_db_and_table {
sub print_sort_form {	sub print_sort_form {
my ($r,$pretty_query_string) = @_;	my ($r,$pretty_query_string) = @_;
##	##
my %SortableFields =	my %SortableFields=&Apache::lonlocal::texthash(
(id => 'Default',	id => 'Default',
title => 'Title',	title => 'Title',
author => 'Author',	author => 'Author',
subject => 'Subject',	subject => 'Subject',
Line 1649 sub print_sort_form {	Line 1867 sub print_sort_form {
copyright => 'Copyright',	copyright => 'Copyright',
hostname => 'Host',	hostname => 'Host',
creationdate => 'Creation Date',	creationdate => 'Creation Date',
lastrevisiondate => 'Revision Date',	lastrevisiondate => 'Revision Date'
);	);
##	##
my $table = $ENV{'form.table'};	my $table = $ENV{'form.table'};
Line 1725 the following format:	Line 1943 the following format:

=cut	=cut

##	#####################################################################
## Restrictions:	#####################################################################
## columns of type 'text' and 'blob' cannot have defaults.
## columns of type 'enum' cannot be used for FULLTEXT.	my @Datatypes =
##	( { name => 'id',
my @DataOrder = qw/id title author subject url keywords version notes	type => 'MEDIUMINT',
abstract mime lang owner copyright creationdate lastrevisiondate hostname/;	restrictions => 'UNSIGNED NOT NULL',
	primary_key => 'yes',
my %Datatypes =	auto_inc => 'yes' },
( id =>{ type => 'MEDIUMINT',	{ name => 'title', type=>'TEXT'},
restrictions => 'UNSIGNED NOT NULL',	{ name => 'author', type=>'TEXT'},
primary_key => 'yes',	{ name => 'subject', type=>'TEXT'},
auto_inc => 'yes'	{ name => 'url', type=>'TEXT', restrictions => 'NOT NULL' },
},	{ name => 'keywords', type=>'TEXT'},
title =>{ type=>'TEXT'},	{ name => 'version', type=>'TEXT'},
author =>{ type=>'TEXT'},	{ name => 'notes', type=>'TEXT'},
subject =>{ type=>'TEXT'},	{ name => 'abstract', type=>'TEXT'},
url =>{ type=>'TEXT',	{ name => 'mime', type=>'TEXT'},
restrictions => 'NOT NULL' },	{ name => 'lang', type=>'TEXT'},
keywords =>{ type=>'TEXT'},	{ name => 'owner', type=>'TEXT'},
version =>{ type=>'TEXT'},	{ name => 'copyright', type=>'TEXT'},
notes =>{ type=>'TEXT'},	{ name => 'hostname', type=>'TEXT'},
abstract =>{ type=>'TEXT'},
mime =>{ type=>'TEXT'},
lang =>{ type=>'TEXT'},
owner =>{ type=>'TEXT'},
copyright =>{ type=>'TEXT'},
hostname =>{ type=>'TEXT'},
#--------------------------------------------------	#--------------------------------------------------
creationdate =>{ type=>'DATETIME'},	{ name => 'creationdate', type=>'DATETIME'},
lastrevisiondate =>{ type=>'DATETIME'},	{ name => 'lastrevisiondate', type=>'DATETIME'},
#--------------------------------------------------	#--------------------------------------------------
);	);

Line 1783 Returns: the identifier of the table on	Line 1995 Returns: the identifier of the table on
######################################################################	######################################################################
sub create_results_table {	sub create_results_table {
my $table = &Apache::lonmysql::create_table	my $table = &Apache::lonmysql::create_table
( { columns => \%Datatypes,	( { columns => \@Datatypes,
column_order => \@DataOrder,	FULLTEXT => [{'columns' => \@Fullindicies},],
fullindex => \@Fullindicies,
} );	} );
if (defined($table)) {	if (defined($table)) {
$ENV{'form.table'} = $table;	$ENV{'form.table'} = $table;
Line 1867 sub revise_button {	Line 2078 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'.
'&phase='.$revise_phase;	'&phase='.$revise_phase;
my $result = qq{<input type="button" value="Revise search" name="revise"} .	my $result = qq{<input type="button" value="Revise search" name="revise"} .
qq{ onClick="parent.location='$newloc';" /> };	qq{ onClick="parent.location='$newloc';" /> };
Line 1909 END	Line 2121 END
if (@Lines > 2) {	if (@Lines > 2) {
$pretty_string = join '<br \>',(@Lines[0..2],'....<br />');	$pretty_string = join '<br \>',(@Lines[0..2],'....<br />');
}	}
$r->print("Search: ".$pretty_string);	$r->print(&mt("Search").": ".$pretty_string);
$r->rflush();	$r->rflush();
#	#
# Determine the servers we need to contact.	# Determine the servers we need to contact.
Line 1968 END	Line 2180 END
my $time_remaining = $max_time - (time - $starttime) ;	my $time_remaining = $max_time - (time - $starttime) ;
my $last_time = $time_remaining;	my $last_time = $time_remaining;
&update_seconds($r,$time_remaining);	&update_seconds($r,$time_remaining);
while (($time_remaining > 0) &&	&update_status($r,'contacting '.$Servers_to_contact[0]);
	while (($time_remaining > 0) &&
((@Servers_to_contact) \|\| keys(%Server_status))) {	((@Servers_to_contact) \|\| keys(%Server_status))) {
# Send out a search request if it needs to be done.	# Send out a search request if it needs to be done.
if (@Servers_to_contact) {	if (@Servers_to_contact) {
# Contact one server	# Contact one server
my $server = shift(@Servers_to_contact);	my $server = shift(@Servers_to_contact);
	&update_status($r,&mt('contacting').' '.$server);
my $reply=&Apache::lonnet::metadata_query($query,$customquery,	my $reply=&Apache::lonnet::metadata_query($query,$customquery,
$customshow,[$server]);	$customshow,[$server]);
($server) = keys(%$reply);	($server) = keys(%$reply);
$Server_status{$server} = $reply->{$server};	$Server_status{$server} = $reply->{$server};
&update_status($r,'contacting '.$server);
} else {	} else {
# wait a sec. to give time for files to be written	# wait a sec. to give time for files to be written
# This sleep statement is here instead of outside the else	# This sleep statement is here instead of outside the else
# block because we do not want to pause if we have servers	# block because we do not want to pause if we have servers
# left to contact.	# left to contact.
	if (scalar (keys(%Server_status))) {
	&update_status($r,
	&mt('waiting on').' '.(join(' ',keys(%Server_status))));
	}
sleep(1);	sleep(1);
}	}
&update_status($r,'waiting on '.(join(' ',keys(%Server_status))));	#
	#
	# Loop through the servers we have contacted but do not
	# have results from yet, looking for results.
while (my ($server,$status) = each(%Server_status)) {	while (my ($server,$status) = each(%Server_status)) {
last if ($connection->aborted());	last if ($connection->aborted());
if ($status eq 'con_lost') {	if ($status eq 'con_lost') {
Line 1996 END	Line 2216 END
$status=~/^([\.\w]+)$/;	$status=~/^([\.\w]+)$/;
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;	my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
if (-e $datafile && ! -e "$datafile.end") {	if (-e $datafile && ! -e "$datafile.end") {
&update_status($r,'Receiving results from '.$server);	&update_status($r,&mt('Receiving results from').' '.$server);
next;	next;
}	}
last if ($connection->aborted());	last if ($connection->aborted());
if (-e "$datafile.end") {	if (-e "$datafile.end") {
&update_status($r,'Reading results from '.$server);	&update_status($r,&mt('Reading results from').' '.$server);
if (-z "$datafile") {	if (-z "$datafile") {
delete($Server_status{$server});	delete($Server_status{$server});
next;	next;
Line 2049 END	Line 2269 END
}	}
last if ($connection->aborted());	last if ($connection->aborted());
# Finished looping through the servers	# Finished looping through the servers
	$starttime = time if (@Servers_to_contact);
$time_remaining = $max_time - (time - $starttime) ;	$time_remaining = $max_time - (time - $starttime) ;
if ($last_time - $time_remaining > 0) {	if ($last_time - $time_remaining > 0) {
$last_time = $time_remaining;	$last_time = $time_remaining;
&update_seconds($r,$time_remaining);	&update_seconds($r,$time_remaining);
}	}
}	}
&update_status($r,'Search Complete'.$server);	&update_status($r,&mt('Search Complete').$server);
&update_seconds($r,0);	&update_seconds($r,0);
&Apache::lonmysql::disconnect_from_db();	&Apache::lonmysql::disconnect_from_db();
# We have run out of time or run out of servers to talk to and	# We have run out of time or run out of servers to talk to and
Line 2140 sub display_results {	Line 2361 sub display_results {
return;	return;
}	}
##	##
	## $checkbox_num is a count of the number of checkboxes output on the
	## page this is used only during catalogmode=groupsearch.
	my $checkbox_num = 0;
	##
## Get the catalog controls setup	## Get the catalog controls setup
##	##
my $action = "/adm/searchcat?phase=results";	my $action = "/adm/searchcat?phase=results";
Line 2195 sub display_results {	Line 2420 sub display_results {
."</center>\n"	."</center>\n"
);	);
if ($total_results == 0) {	if ($total_results == 0) {
$r->print("There are currently no results.\n".	$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.
	'<h3>'.&mt('There are currently no results').'.</h3>'.
"</form></body></html>");	"</form></body></html>");
return;	return;
} else {	} else {
Line 2212 sub display_results {	Line 2438 sub display_results {
##	##
foreach my $row (@Results) {	foreach my $row (@Results) {
if ($connection->aborted()) {	if ($connection->aborted()) {
untie %groupsearch_db if (tied(%groupsearch_db));	&cleanup();
&Apache::lonmysql::disconnect_from_db();
return;	return;
}	}
my %Fields = %{&parse_row(@$row)};	my %Fields = %{&parse_row(@$row)};
my $output="<p>\n";	my $output="<p>\n";
my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'});	my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},
	$Fields{'id'},$checkbox_num++);
# 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.
Line 2226 sub display_results {	Line 2452 sub display_results {
$r->rflush();	$r->rflush();
}	}
if (@Results < 1) {	if (@Results < 1) {
$r->print("There were no results matching your query");	$r->print(&mt("There were no results matching your query"));
} else {	} else {
$r->print	$r->print
('<center>'.	('<center>'.
Line 2249 sub display_results {	Line 2475 sub display_results {

=pod	=pod

=item &catalogmode_output($title,$url)	=item &catalogmode_output($title,$url,$fnum,$checkbox_num)

Returns html needed for the various catalog modes. Gets inputs from	Returns html needed for the various catalog modes. Gets inputs from
$ENV{'form.catalogmode'}. Stores data in %groupsearch_db and $fnum	$ENV{'form.catalogmode'}. Stores data in %groupsearch_db.
(local variable).

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
{
my $fnum = 0;

sub catalogmode_output {	sub catalogmode_output {
my $output = '';	my $output = '';
my ($title,$url) = @_;	my ($title,$url,$fnum,$checkbox_num) = @_;
if ($ENV{'form.catalogmode'} eq 'interactive') {	if ($ENV{'form.catalogmode'} eq 'interactive') {
$title=~ s/\'/\\\'/g;	$title=~ s/\'/\\\'/g;
if ($ENV{'form.catalogmode'} eq 'interactive') {	if ($ENV{'form.catalogmode'} eq 'interactive') {
Line 2280 END	Line 2502 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($fnum)" />	onClick="javascript:queue($checkbox_num,$fnum)" />
</font>	</font>
END	END
$fnum++;
}	}
return $output;	return $output;
}	}

}
######################################################################	######################################################################
######################################################################	######################################################################

Line 2306 sub parse_row {	Line 2525 sub parse_row {
my @Row = @_;	my @Row = @_;
my %Fields;	my %Fields;
for (my $i=0;$i<=$#Row;$i++) {	for (my $i=0;$i<=$#Row;$i++) {
$Fields{$DataOrder[$i]}=&Apache::lonnet::unescape($Row[$i]);	$Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);
}	}
$Fields{'language'} =	$Fields{'language'} =
&Apache::loncommon::languagedescription($Fields{'lang'});	&Apache::loncommon::languagedescription($Fields{'lang'});
Line 2476 Checked for existance & 'edit' mode.	Line 2695 Checked for existance & 'edit' mode.

=item 'form.form'	=item 'form.form'

	Contains the name of the form that has the input fields to set

=item 'form.element'	=item 'form.element'

	the name of the input field to put the URL into

	=item 'form.titleelement'

	the name of the input field to put the title into

=back	=back

=cut	=cut
Line 2514 SCRIPT	Line 2741 SCRIPT
} elsif ($ENV{'form.mode'} eq 'edit') {	} elsif ($ENV{'form.mode'} eq 'edit') {
my $form = $ENV{'form.form'};	my $form = $ENV{'form.form'};
my $element = $ENV{'form.element'};	my $element = $ENV{'form.element'};
	my $titleelement = $ENV{'form.titleelement'};
	my $changetitle;
	if (!$titleelement) {
	$changetitle='function changeTitle(val) {}';
	} else {
	$changetitle=<<END;
	function changeTitle(val) {
	if (parent.targetwin.document) {
	parent.targetwin.document.forms["$form"].elements["$titleelement"].value=val;
	} else {
	var url = 'forms[\"$form\"].elements[\"$titleelement\"].value';
	alert("Unable to transfer data to "+url);
	}
	}
	END
	}

$result.=<<SCRIPT;	$result.=<<SCRIPT;
<script type="text/javascript">	<script type="text/javascript">
function select_data(title,url) {	function select_data(title,url) {
changeURL(url);	changeURL(url);
	changeTitle(title);
parent.close();	parent.close();
}	}
function changeTitle(val) {	$changetitle
}
function changeURL(val) {	function changeURL(val) {
if (parent.targetwin.document) {	if (parent.targetwin.document) {
parent.targetwin.document.forms["$form"].elements["$element"].value=val;	parent.targetwin.document.forms["$form"].elements["$element"].value=val;
Line 2536 SCRIPT	Line 2780 SCRIPT
}	}
$result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';	$result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';
<script type="text/javascript">	<script type="text/javascript">
function queue(val) {	function queue(checkbox_num,val) {
if (document.forms.results.returnvalues[val].checked) {	if (document.forms.results.returnvalues.length != "undefined" &&
parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';	typeof(document.forms.results.returnvalues.length) == "number") {
	if (document.forms.results.returnvalues[checkbox_num].checked) {
	parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
	} else {
	parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
	}
} else {	} else {
parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';	if (document.forms.results.returnvalues.checked) {
	parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
	} else {
	parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
	}
}	}
}	}
function select_group() {	function select_group() {
Line 2592 sub print_frames_interface {	Line 2845 sub print_frames_interface {
<head>	<head>
<script>	<script>
var targetwin = opener;	var targetwin = opener;
	var queue = '';
</script>	</script>
<title>LON-CAPA Digital Library Search Results</title>	<title>LON-CAPA Digital Library Search Results</title>
</head>	</head>
Line 2629 extra custom metadata to show.	Line 2883 extra custom metadata to show.
######################################################################	######################################################################
sub detailed_citation_view {	sub detailed_citation_view {
my ($prefix,%values) = @_;	my ($prefix,%values) = @_;
	my $icon=&Apache::loncommon::icon($values{'url'});
my $result=<<END;	my $result=<<END;
<b>$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"	<b>$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'title'}</a></b>	target='search_preview'>$values{'title'}</a></b>
<p>	<p>
<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />	<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
Line 2663 END	Line 2918 END
######################################################################	######################################################################
sub summary_view {	sub summary_view {
my ($prefix,%values) = @_;	my ($prefix,%values) = @_;
	my $icon=&Apache::loncommon::icon($values{'url'});
my $result=<<END;	my $result=<<END;
$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"	$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'author'}</a><br />	target='search_preview'>$values{'author'}</a><br />
$values{'title'}<br />	$values{'title'}<br />
$values{'owner'} -- $values{'lastrevisiondate'}<br />	$values{'owner'} -- $values{'lastrevisiondate'}<br />
Line 2689 END	Line 2945 END
######################################################################	######################################################################
sub compact_view {	sub compact_view {
my ($prefix,%values) = @_;	my ($prefix,%values) = @_;
	my $icon=&Apache::loncommon::icon($values{'url'});
my $result=<<END;	my $result=<<END;
$prefix <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'>	$prefix <img src="$icon" /> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'>
$values{'title'}</a>	$values{'title'}</a>
<b>$values{'author'}</b><br />	<b>$values{'author'}</b><br />
END	END
Line 2711 END	Line 2968 END
######################################################################	######################################################################
sub fielded_format_view {	sub fielded_format_view {
my ($prefix,%values) = @_;	my ($prefix,%values) = @_;
	my $icon=&Apache::loncommon::icon($values{'url'});
my $result=<<END;	my $result=<<END;
$prefix	$prefix <img src="$icon" />
<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"	<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'url'}</a>	target='search_preview'>$values{'url'}</a>
<br />	<br />
Line 2930 sub start_fresh_session {	Line 3188 sub start_fresh_session {

1;	1;

	sub cleanup {
	if (tied(%groupsearch_db)) {
	unless (untie(%groupsearch_db)) {
	&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');
	}
	}
	&untiehash();
	&Apache::lonmysql::disconnect_from_db();
	}

__END__	__END__

=pod	=pod

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

Removed from v.1.156
changed lines
	Added in v.1.194