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.207 and 1.215

version 1.207, 2004/04/19 13:51:36	version 1.215, 2004/04/22 20:05:18
Line 74 use Apache::lonmeta;	Line 74 use Apache::lonmeta;
use Apache::lonhtmlcommon;	use Apache::lonhtmlcommon;
use Apache::lonlocal;	use Apache::lonlocal;
use LONCAPA::lonmetadata();	use LONCAPA::lonmetadata();
	use HTML::Entities();

######################################################################	######################################################################
######################################################################	######################################################################
Line 149 sub handler {	Line 150 sub handler {
## Initialize global variables	## Initialize global variables
##	##
my $domain = $r->dir_config('lonDefDomain');	my $domain = $r->dir_config('lonDefDomain');
$diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";	$diropendb= "/home/httpd/perl/tmp/".
	"$ENV{'user.domain'}_$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 164 sub handler {	Line 166 sub handler {
'_'.&Apache::lonnet::escape($ENV{'user.name'}).	'_'.&Apache::lonnet::escape($ENV{'user.name'}).
'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db';	'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db';
##	##
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	if (exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') {
	&Apache::lonhtmlcommon::add_breadcrumb
	({href=>'/adm/searchcat?'.
	'catalogmode='.$ENV{'form.catalogmode'}.
	'&launch='.$ENV{'form.launch'}.
	'&mode='.$ENV{'form.mode'},
	text=>"Course and Catalog Search",
	bug=>'Searching',});
	} else {
	&Apache::lonhtmlcommon::add_breadcrumb
	({href=>'/adm/searchcat?'.
	'catalogmode='.$ENV{'form.catalogmode'}.
	'&launch='.$ENV{'form.launch'}.
	'&mode='.$ENV{'form.mode'},
	text=>"Catalog Search",
	bug=>'Searching',});
	}
	#
if (! &get_persistent_form_data($persistent_db_file)) {	if (! &get_persistent_form_data($persistent_db_file)) {
if ($ENV{'form.phase'} =~ /(run_search\|results)/) {	if ($ENV{'form.phase'} =~ /(run_search\|results)/) {
&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".	&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".
Line 264 END	Line 285 END
}	}
$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));	$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'}));	$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'}));
	#
	$ENV{'form.searchmode'} = 'basic';
	if ($ENV{'form.phase'} eq 'adv_search' \|\|
	$ENV{'form.phase'} eq 'disp_adv') {
	$ENV{'form.searchmode'} = 'advanced';
	} elsif ($ENV{'form.phase'} eq 'course_search') {
	$ENV{'form.searchmode'} = 'course_search';
	}
	#
	if ($ENV{'form.searchmode'} eq 'advanced') {
	&Apache::lonhtmlcommon::add_breadcrumb
	({href=>'/adm/searchcat?phase=disp_adv&'.
	'catalogmode='.$ENV{'form.catalogmode'}.
	'&launch='.$ENV{'form.launch'}.
	'&mode='.$ENV{'form.mode'},
	text=>"Advanced Search",
	bug=>'Searching',});
	} elsif ($ENV{'form.searchmode'} eq 'course search') {
	&Apache::lonhtmlcommon::add_breadcrumb
	({href=>'/adm/searchcat?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 288 END	Line 335 END
&course_search($r);	&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';
if ($ENV{'form.phase'} eq 'adv_search') {
$ENV{'form.searchmode'} = 'advanced';
}
# Set up table	# Set up table
if (! defined(&create_results_table())) {	if (! defined(&create_results_table())) {
my $errorstring=&Apache::lonmysql::get_error();	my $errorstring=&Apache::lonmysql::get_error();
	&Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '.
	'needed table. lonmysql error:'.
	$errorstring);
$r->print(<<END);	$r->print(<<END);
<html><head><title>Search Error</title></head>	<html><head><title>Search Error</title></head>
$bodytag	$bodytag
Unable to create table in which to store search results.	Unable to create table in which to store search results.
The search has been aborted.	The search has been aborted.
<br />$errorstring
</body>	</body>
</html>	</html>
END	END
Line 487 Prints the form for the basic search. S	Line 532 Prints the form for the basic search. S
sub print_basic_search_form {	sub print_basic_search_form {
my ($r,$closebutton,$hidden_fields) = @_;	my ($r,$closebutton,$hidden_fields) = @_;
my $bodytag=&Apache::loncommon::bodytag('Search').	my $bodytag=&Apache::loncommon::bodytag('Search').
&Apache::loncommon::help_open_topic('Finding_Resources').	&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Finding_Resources',
&Apache::loncommon::help_open_bug('Searching');	undef,undef,! $ENV{'form.launch'});
my $scrout = &search_html_header().$bodytag;	my $scrout = &search_html_header().$bodytag;
if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {	if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
my $CatalogSearch=&mt('Catalog Search');	# Define interface components
my $Statement=&searchhelp();	my $userelatedwords=
$scrout.=(<<ENDDOCUMENT);	&mt('[_1] use related words',
<h1>$CatalogSearch</h1>	&Apache::lonhtmlcommon::checkbox
<form name="loncapa_search" method="post" action="/adm/searchcat">	('related',$ENV{'form.related'}));
<input type="hidden" name="phase" value="basic_search" />	my $onlysearchdomain=
$hidden_fields	&mt('[_1] only search domain [_2]',
<p>	&Apache::lonhtmlcommon::checkbox
$Statement.	('domains',$ENV{'form.domains'}),
</p>	$r->dir_config('lonDefDomain'));
<p>	my $adv_search_link =
<table>	'<a href="/adm/searchcat?'.
<tr><td>	'phase=disp_adv&'.
ENDDOCUMENT	'catalogmode='.$ENV{'form.catalogmode'}.
$scrout.=' '.	'&launch='.$ENV{'form.launch'}.
&Apache::lonhtmlcommon::textbox('basicexp',	'&mode='.$ENV{'form.mode'}.
$ENV{'form.basicexp'},40).	'">'.&mt('Advanced Search').'</a>';
' ';	#
my $relatedcheckbox =	$scrout.='<form name="loncapa_search" method="post" '.
&Apache::lonhtmlcommon::checkbox('related',	'action="/adm/searchcat">'.
$ENV{'form.related'});	'<input type="hidden" name="phase" value="basic_search" />'.
my $domain = $r->dir_config('lonDefDomain');	$hidden_fields;
my $domaincheckbox =	#
&Apache::lonhtmlcommon::checkbox('domains',	$scrout .= '<center>'.$/;
$ENV{'form.domains'});	if ($ENV{'request.course.id'}) {
my $srch=&mt('Search');	$scrout .= '<h1>'.&mt('LON-CAPA Catalog Search').'</h1>';
my $header=&mt('Advanced Search');	} else {
my $userelatedwords=&mt('use related words');	# No need to tell them they are searching
my $onlysearchdomain=&mt('only search domain');	$scrout.= ('<br />'x2);
my $view=&viewoptions();	}
$scrout.=<<END;	$scrout.='<table>'.
</td><td><a	'<tr><td align="center" valign="top">'.
href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}"	&Apache::lonhtmlcommon::textbox('basicexp',
>$header</a></td></tr>	$ENV{'form.basicexp'},50).'<br />'.
<tr><td>$relatedcheckbox $userelatedwords</td>	'<font size="-1">'.&searchhelp().'</font>'.'</td>'.
<td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr>	'<td><font size="-1">'.
</table>	'<nobr>'.(' 'x3).$adv_search_link.'</nobr>'.'<br />'.
</p>	'<nobr>'.(' 'x1).$userelatedwords.'</nobr>'.'<br />'.
$view	'<nobr>'.(' 'x1).$onlysearchdomain.'</nobr>'.'<br />'.
<p>	'</font></td>'.
<input type="submit" name="basicsubmit" value='$srch' />	'</tr>'.$/;
$closebutton	#
END	# $scrout .= '<tr><td align="center">'.
$scrout.=<<ENDDOCUMENT;	# '<font size="-1">'.
</p>	# $userelatedwords.(' 'x3).
</form>	# $onlysearchdomain.(' 'x2).$adv_search_link.
ENDDOCUMENT	# '</font>'.
	# '</td></tr>'.$/;
	$scrout .= '<tr><td align="center" colspan="2">'.
	'<font size="-1">'.
	'<input type="submit" name="basicsubmit" '.
	'value="'.&mt('Search').'" />'.
	(' 'x2).$closebutton.(' 'x2).&viewoptions().
	'</font>'.
	'</td></tr>'.$/;
	$scrout .= '</table>'.$/.'</center>'.'</form>';
}	}
if ($ENV{'request.course.id'}) {	if ($ENV{'request.course.id'}) {
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
'srch' => 'Search',
'header' => 'Course Search',	'header' => 'Course Search',
'note' => 'Enter terms or phrases, then press "Search" below',	'note' => 'Enter terms or phrases, then press "Search" below',
'use' => 'use related words',	'use' => 'use related words',
'full' =>'fulltext search (time consuming)'	'full' =>'fulltext search (time consuming)'
);	);
$scrout.=(<<ENDCOURSESEARCH);	$scrout.=(<<ENDCOURSESEARCH);
	<form name="loncapa_search" method="post" action="/adm/searchcat">
	<center>
<hr />	<hr />
<h1>$lt{'header'}</h1>	<h1>$lt{'header'}</h1>
<form name="course_search" method="post" action="/adm/searchcat">
<input type="hidden" name="phase" value="course_search" />	<input type="hidden" name="phase" value="course_search" />
$hidden_fields	$hidden_fields
<p>	<p>
Line 576 ENDCOURSESEARCH	Line 630 ENDCOURSESEARCH
</table><p>	</table><p>
<input type="submit" name="coursesubmit" value='$lt{'srch'}' />	<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
</p>	</p>
	</center>
	</form>
ENDENDCOURSE	ENDENDCOURSE
}	}
$scrout.=(<<ENDDOCUMENT);	$scrout.=(<<ENDDOCUMENT);
Line 609 sub print_advanced_search_form{	Line 665 sub print_advanced_search_form{
<input type="reset" name="reset" value='$lt{"reset"}' />	<input type="reset" name="reset" value='$lt{"reset"}' />
$closebutton	$closebutton
<input type="button" value="$lt{'help'}" onClick="openhelp()" />	<input type="button" value="$lt{'help'}" onClick="openhelp()" />
</p>
END	END
my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search');	my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search').
	&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching',
	'Finding_Resources',
	undef,undef,
	! $ENV{'form.launch'});
my $searchhelp=&searchhelp();	my $searchhelp=&searchhelp();
my $scrout=&search_html_header();	my $scrout=&search_html_header();
$scrout .= <<"ENDHEADER";	$scrout .= <<"ENDHEADER";
$bodytag	$bodytag
$searchhelp
<form method="post" action="/adm/searchcat" name="advsearch">	<form method="post" action="/adm/searchcat" name="advsearch">
$advanced_buttons	$advanced_buttons
$hidden_fields
<input type="hidden" name="phase" value="adv_search" />
ENDHEADER	ENDHEADER
$scrout.=&viewoptions();	$scrout.=(' 'x2).&viewoptions().'</p>'.$hidden_fields.
	'<input type="hidden" name="phase" value="adv_search" />';
my %fields=&Apache::lonmeta::fieldnames();	my %fields=&Apache::lonmeta::fieldnames();
	#
$scrout.='<table>';	$scrout.= '<p>'.$searchhelp.'</p>'.
$scrout.="<tr><th>".&mt('Field').'</th><th>'.&mt('Value').'</th><th>'	"<table>\n";
.&mt('Related').'<br />'.&mt('Words')."</td></tr>\n";	my %related_word_search =
foreach ('title','author','owner','authorspace','modifyinguser',	('title'=>1,
'keywords','notes','abstract','standards',	'author'=>0,
'lowestgradelevel','highestgradelevel','mime') {	'owner'=>0,
$scrout.='<tr><td>'.&titlefield($fields{$_}).'</td><td>'.	'authorspace'=>0,
&Apache::lonmeta::prettyinput($_,$ENV{'form.'.$_},$_,'advsearch',	'modifyinguser'=>0,
1,'</td><td>',$ENV{'form.'.$_.'_related'}).	'keywords'=>1,
'</td></tr>';	'notes'=>1,
	'abstract'=>1,
	'standards'=>1,
	'mime'=>1,
	);
	#
	foreach my $field ('title','author','owner','authorspace','modifyinguser',
	'keywords','notes','abstract','standards','mime') {
	$scrout.='<tr><td align="right">'.&titlefield($fields{$field}).'</td><td>'.
	&Apache::lonmeta::prettyinput($field,
	$ENV{'form.'.$field},
	$field,
	'advsearch',
	$related_word_search{$field},
	'</td><td align="left">',
	$ENV{'form.'.$field.'_related'},
	50);
	if ($related_word_search{$field}) {
	$scrout .= 'related words';
	} else {
	$scrout .= '</td><td> ';
	}
	$scrout .= '</td></tr>'.$/;
	}
	foreach my $field ('lowestgradelevel','highestgradelevel') {
	$scrout.='<tr>'.
	'<td align="right">'.&titlefield($fields{$field}).'</td>'.
	'<td colspan="2">'.
	&Apache::lonmeta::prettyinput($field,
	$ENV{'form.'.$field},
	$field,
	'advsearch',
	0).
	'</td></tr>'.$/;
}	}
$scrout.='<tr><td>'.	$scrout.='<tr><td align="right">'.
&titlefield(&mt('MIME Type Category')).'</td><td>'.	&titlefield(&mt('MIME Type Category')).'</td><td colspan="2">'.
&Apache::loncommon::filecategoryselect('category',	&Apache::loncommon::filecategoryselect('category',
$ENV{'form.category'}).	$ENV{'form.category'}).
'</td><td> </td></td></tr>';	'</td></tr>'.$/;
$scrout.='<tr><td>'.	$scrout.='<tr><td align="right" valign="top">'.
&titlefield(&mt('Limit Search to Domains')).'</td><td>'.	&titlefield(&mt('Domains')).'</td><td colspan="2">'.
&Apache::loncommon::domain_select('domains',	&Apache::loncommon::domain_select('domains',
$ENV{'form.domains'},1).	$ENV{'form.domains'},1).
'</td><td> </td></td></tr>';	'</td></tr>'.$/;
	$scrout .= "</table>\n<br />\n<table>\n";
my %dates=&Apache::lonlocal::texthash	my %dates=&Apache::lonlocal::texthash
('creationdatestart' => 'Creation Date After',	('creationdatestart' => 'Creation Date After',
'creationdateend' => 'Creation Date Before',	'creationdateend' => 'Creation Date Before',
'lastrevisiondatestart' => 'Last Revision Date After',	'lastrevisiondatestart' => 'Last Revision Date After',
'lastrevisiondateend' => 'Last Revision Date Before');	'lastrevisiondateend' => 'Last Revision Date Before');
foreach (sort keys %dates) {	foreach my $field (sort keys %dates) {
$scrout.='<tr>'.	$scrout.='<tr>'.
'<td>'.&titlefield($dates{$_}).'</td><td>'.	'<td align="right">'.&titlefield($dates{$field}).'</td><td>'.
&Apache::lonhtmlcommon::date_setter('advsearch',$_,0,'',1).	&Apache::lonhtmlcommon::date_setter('advsearch',$field,0,'',1).
'</td><td> </td></td>'.	'</td></tr>'.$/;
'</tr>';
}	}

$scrout.="</table>\n";	$scrout.="</table>\n";
$scrout.=<<ENDDOCUMENT;	$scrout.=<<ENDDOCUMENT;
$advanced_buttons	$advanced_buttons
Line 687 Outputs: titletext with font wrapper	Line 776 Outputs: titletext with font wrapper
######################################################################	######################################################################
sub titlefield {	sub titlefield {
my $title=shift;	my $title=shift;
return '<font face="arial" color="#800000">'.$title.'</font>';	return $title;
}	}

######################################################################	######################################################################
Line 732 Outputs: text for box with view options	Line 821 Outputs: text for box with view options
######################################################################	######################################################################
######################################################################	######################################################################
sub viewoptions {	sub viewoptions {
my $scrout="\n\n".'<table>'.	my $scrout="\n".'<nobr>';
'<tr><th>'.&mt('View Options').'</th><th>'.	if (! defined($ENV{'form.viewselect'})) {
&mt('Records per Page').'</th></tr><tr><td>';	$ENV{'form.viewselect'}='detailed';
unless ($ENV{'form.viewselect'}) { $ENV{'form.viewselect'}='detailed'; }	}
$scrout.=&Apache::lonmeta::selectbox('viewselect',	$scrout.=&Apache::lonmeta::selectbox('viewselect',
$ENV{'form.viewselect'},	$ENV{'form.viewselect'},
\&viewoptiontext,	\&viewoptiontext,
sort(keys(%Views)));	sort(keys(%Views)));
$scrout.='</td><td>';	$scrout.= '  ';
$scrout.=&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.="</td></tr></table>\n\n";	$scrout .= (' 'x2).&mt('[_1] Records per Page',$countselect).
	'</nobr>'.$/;
return $scrout;	return $scrout;
}	}

Line 987 sub parse_advanced_search {	Line 1077 sub parse_advanced_search {
$fillflag++;	$fillflag++;
}	}
}	}
unless ($fillflag) {	if (! $fillflag) {
&output_blank_field_error($r,$closebutton,	&output_blank_field_error($r,$closebutton,
'phase=disp_adv',$hidden_fields);	'phase=disp_adv',$hidden_fields);
return ;	return ;
Line 1643 Returns: the identifier of the table on	Line 1733 Returns: the identifier of the table on
sub set_up_table_structure {	sub set_up_table_structure {
my ($datatypes,$fullindicies) =	my ($datatypes,$fullindicies) =
&LONCAPA::lonmetadata::describe_metadata_storage();	&LONCAPA::lonmetadata::describe_metadata_storage();
unshift(@$datatypes,{name => 'id',	# Copy the table description before modifying it...
	@Datatypes = @{$datatypes};
	unshift(@Datatypes,{name => 'id',
type => 'MEDIUMINT',	type => 'MEDIUMINT',
restrictions => 'UNSIGNED NOT NULL',	restrictions => 'UNSIGNED NOT NULL',
primary_key => 'yes',	primary_key => 'yes',
auto_inc => 'yes' });	auto_inc => 'yes' });
@Datatypes = @{$datatypes};
@Fullindicies = @{$fullindicies};	@Fullindicies = @{$fullindicies};
return;	return;
}	}
Line 1711 sub update_status {	Line 1802 sub update_status {
$r->rflush();	$r->rflush();
}	}

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

	sub reset_timing {
	$start_time = 0;
	$last_time = 0;
	}

	sub time_left {
	if ($start_time == 0) {
	$start_time = time;
	}
	my $time_left = $max_time - (time - $start_time);
	$time_left = 0 if ($time_left < 0);
	return $time_left;
	}

sub update_seconds {	sub update_seconds {
my ($r,$text) = @_;	my ($r) = @_;
$text =~ s/\'/\\\'/g;	my $time = &time_left();
$r->print	if (($last_time-$time) > 0) {
("<script>document.statusform.seconds.value = ' $text'</script>\n");	$r->print("<script>".
$r->rflush();	"document.statusform.seconds.value = '$time'".
	"</script>\n");
	$r->rflush();
	}
	$last_time = $time;
	}

}	}

######################################################################	######################################################################
Line 1765 sub run_search {	Line 1881 sub run_search {
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
my $connection = $r->connection;	my $connection = $r->connection;
#	#
# Timing variables
#
my $starttime = time;
my $max_time = 30; # seconds for the search to complete
#
# Print run_search header	# Print run_search header
#	#
$r->print(<<END);	$r->print(<<END);
Line 1786 END	Line 1897 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(&mt("Search").": ".$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.
Line 1801 END	Line 1912 END
@Servers_to_contact = sort(keys(%Apache::lonnet::libserv));	@Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
}	}
my %Server_status;	my %Server_status;
	#
	# Check on the mysql table we will use to store results.
my $table =$ENV{'form.table'};	my $table =$ENV{'form.table'};
if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {	if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {
$r->print("Unable to determine table id to store search results in.".	$r->print("Unable to determine table id to store search results in.".
Line 1845 END	Line 1958 END
</form>	</form>
END	END
$r->rflush();	$r->rflush();
my $time_remaining = $max_time - (time - $starttime) ;	&reset_timing();
my $last_time = $time_remaining;	&update_seconds($r);
&update_seconds($r,$time_remaining);	&update_status($r,&mt('contacting [_1]',$Servers_to_contact[0]));
&update_status($r,'contacting '.$Servers_to_contact[0]);	while (&time_left() &&
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.	&update_seconds($r);
	#
	# Send out a search request
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);	&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]);
($server) = keys(%$reply);	($server) = keys(%$reply);
Line 1867 END	Line 1981 END
# left to contact.	# left to contact.
if (scalar (keys(%Server_status))) {	if (scalar (keys(%Server_status))) {
&update_status($r,	&update_status($r,
&mt('waiting on').' '.(join(' ',keys(%Server_status))));	&mt('waiting on [_1]',join(' ',keys(%Server_status))));
}	}
sleep(1);	sleep(1);
}	}
Line 1876 END	Line 1990 END
# have results from yet, looking for results.	# 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());
	&update_seconds($r);
if ($status eq 'con_lost') {	if ($status eq 'con_lost') {
delete ($Server_status{$server});	delete ($Server_status{$server});
next;	next;
Line 1883 END	Line 1998 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,&mt('Receiving results from').' '.$server);	&update_status($r,&mt('Receiving results from [_1]',$server));
next;	next;
}	}
last if ($connection->aborted());	last if ($connection->aborted());
if (-e "$datafile.end") {	if (-e "$datafile.end") {
&update_status($r,&mt('Reading results from').' '.$server);	&update_status($r,&mt('Reading results from [_1]',$server));
if (-z "$datafile") {	if (-z "$datafile") {
delete($Server_status{$server});	delete($Server_status{$server});
next;	next;
Line 1903 END	Line 2018 END
# Read in the whole file.	# Read in the whole file.
while (my $result = <$fh>) {	while (my $result = <$fh>) {
last if ($connection->aborted());	last if ($connection->aborted());
# handle custom fields? Someday we will!	#
	# Records are stored one per line
chomp($result);	chomp($result);
next unless $result;	next if (! $result);
	#
# Parse the result.	# Parse the result.
my %Fields = &parse_raw_result($result,$server);	my %Fields = &parse_raw_result($result,$server);
$Fields{'hostname'} = $server;	$Fields{'hostname'} = $server;
	#
	# Skip based on copyright
next if (! &copyright_check(\%Fields));	next if (! &copyright_check(\%Fields));
	#
# Store the result in the mysql database	# Store the result in the mysql database
my $result = &Apache::lonmysql::store_row($table,\%Fields);	my $result = &Apache::lonmysql::store_row($table,\%Fields);
if (! defined($result)) {	if (! defined($result)) {
$r->print(&Apache::lonmysql::get_error());	$r->print(&Apache::lonmysql::get_error());
}	}
# $r->print(&Apache::lonmysql::get_debug());	#
$hitcountsum ++;	$hitcountsum ++;
$time_remaining = $max_time - (time - $starttime) ;	&update_seconds($r);
if ($last_time - $time_remaining > 0) {
&update_seconds($r,$time_remaining);
$last_time = $time_remaining;
}
if ($hitcountsum % 50 == 0) {	if ($hitcountsum % 50 == 0) {
&update_count_status($r,$hitcountsum);	&update_count_status($r,$hitcountsum);
}	}
} # End of foreach (@results)	}
$fh->close();	$fh->close();
# $server is only deleted if the results file has been	# $server is only deleted if the results file has been
# found and (successfully) opened. This may be a bad idea.	# found and (successfully) opened. This may be a bad idea.
Line 1935 END	Line 2051 END
&update_count_status($r,$hitcountsum);	&update_count_status($r,$hitcountsum);
}	}
last if ($connection->aborted());	last if ($connection->aborted());
# Finished looping through the servers	&update_seconds($r);
$starttime = time if (@Servers_to_contact);
$time_remaining = $max_time - (time - $starttime) ;
if ($last_time - $time_remaining > 0) {
$last_time = $time_remaining;
&update_seconds($r,$time_remaining);
}
}	}
&update_status($r,&mt('Search Complete').$server);	&update_status($r,&mt('Search Complete [_1]',$server));
&update_seconds($r,0);	&update_seconds($r);
#	#
&Apache::lonmysql::disconnect_from_db();	&Apache::lonmysql::disconnect_from_db(); # This is unneccessary
#	#
# We have run out of time or run out of servers to talk to and	# We have run out of time or run out of servers to talk to and
# results to get.	# results to get, so let the client know the top frame needs to be
	# loaded from /adm/searchcat
$r->print("</body></html>");	$r->print("</body></html>");
if ($ENV{'form.catalogmode'} ne 'groupsearch') {	if ($ENV{'form.catalogmode'} ne 'groupsearch') {
$r->print("<script>".	$r->print("<script>".
Line 1977 Returns html for the previous and next b	Line 2088 Returns html for the previous and next b
sub prev_next_buttons {	sub prev_next_buttons {
my ($current_min,$show,$total,$parms) = @_;	my ($current_min,$show,$total,$parms) = @_;
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.
my $links;	#
##	# Create links
## Prev
my $prev_min = $current_min - $show;	my $prev_min = $current_min - $show;
$prev_min = 1 if $prev_min < 1;	$prev_min = 1 if $prev_min < 1;
if ($prev_min < $current_min) {	my $prevlink =
$links .=	qq{<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">};
qq{<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">}.	#
&mt('prev').'</a>';
} else {
$links .= &mt('prev');
}
##
## Pages.... Someday.
##
$links .=
qq{
<a href="/adm/searchcat?$parms&start=$current_min&$show=$show">}.
&mt('reload').'</a>';
##
## Next
my $next_min = $current_min + $show;	my $next_min = $current_min + $show;
$next_min = $current_min if ($next_min > $total);	$next_min = $current_min if ($next_min > $total);
if ($next_min != $current_min) {	my $nextlink =
$links .=	qq{<a href="/adm/searchcat?$parms&start=$next_min&show=$show">};
qq{	my $reloadlink =
<a href="/adm/searchcat?$parms&start=$next_min&show=$show">}.	qq{<a href="/adm/searchcat?$parms&start=$current_min&$show=$show">};
&mt('next').'</a>';	#
} else {	# Determine which parameters to pass
$links .= ' '.&mt('next');	my $String = '[_1]prev[_2]   [_3]reload[_4]   [_5]next[_6]';
}	if ($prev_min == $current_min) {
	$String =~ s:\[_[12]\]::g;
	}
	if ($next_min == $current_min) {
	$String =~ s:\[_[56]\]::g;
	}
	my $links = &mt($String,
	$prevlink, '</a>',
	$reloadlink,'</a>',
	$nextlink, '</a>');
return $links;	return $links;
}	}

Line 2092 sub display_results {	Line 2198 sub display_results {
."</center>\n"	."</center>\n"
);	);
if ($total_results == 0) {	if ($total_results == 0) {
$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.	$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2">'.
'<h3>'.&mt('There are currently no results').'.</h3>'.	'<h3>'.&mt('There are currently no results').'.</h3>'.
"</form></body></html>");	"</form></body></html>");
return;	return;
Line 2113 sub display_results {	Line 2219 sub display_results {
}	}
my %Fields = %{&parse_row(@$row)};	my %Fields = %{&parse_row(@$row)};
my $output="<p>\n";	my $output="<p>\n";
	if (! defined($Fields{'title'}) \|\| $Fields{'title'} eq '') {
	$Fields{'title'} = 'Untitled';
	}
my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},	my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},
$Fields{'id'},$checkbox_num++);	$Fields{'id'},$checkbox_num++);
# Render the result into html	# Render the result into html
Line 2630 END	Line 2739 END
######################################################################	######################################################################
sub xml_sgml_view {	sub xml_sgml_view {
my ($prefix,%values) = @_;	my ($prefix,%values) = @_;
	my $xml = <<END;
	<LonCapaResource>
	<url>$values{'url'}</url>
	<title>$values{'title'}</title>
	<author>$values{'author'}</author>
	<subject>$values{'subject'}</subject>
	<keywords>$values{'keywords'}</keywords>
	<notes>$values{'notes'}</notes>
	<mimeInfo>
	<mime>$values{'mime'}</mime>
	<mimetag>$values{'mimetag'}</mimetag>
	</mimeInfo>
	<languageInfo>
	<language>$values{'language'}</language>
	<languagetag>$values{'languagetag'}</languagetag>
	</languageInfo>
	<creationdate>$values{'creationdate'}</creationdate>
	<lastrevisiondate>$values{'lastrevisiondate'}</lastrevisiondate>
	<owner>$values{'owner'}</owner>
	<copyrightInfo>
	<copyright>$values{'copyright'}</copyright>
	<copyrighttag>$values{'copyrighttag'}</copyrighttag>
	</copyrightInfo>
	<repositoryLocation>$values{'hostname'}</repositoryLocation>
	<shortabstract>$values{'shortabstract'}</shortabstract>
	</LonCapaResource>
	END
	$xml = &HTML::Entities::encode($xml,'<>&');
my $result=<<END;	my $result=<<END;
$prefix	$prefix
<pre>	<pre>
<LonCapaResource>	$xml
<url>$values{'url'}</url>
<title>$values{'title'}</title>
<author>$values{'author'}</author>
<subject>$values{'subject'}</subject>
<keywords>$values{'keywords'}</keywords>
<notes>$values{'notes'}</notes>
<mimeInfo>
<mime>$values{'mime'}</mime>
<mimetag>$values{'mimetag'}</mimetag>
</mimeInfo>
<languageInfo>
<language>$values{'language'}</language>
<languagetag>$values{'languagetag'}</languagetag>
</languageInfo>
<creationdate>$values{'creationdate'}</creationdate>
<lastrevisiondate>$values{'lastrevisiondate'}</lastrevisiondate>
<owner>$values{'owner'}</owner>
<copyrightInfo>
<copyright>$values{'copyright'}</copyright>
<copyrighttag>$values{'copyrighttag'}</copyrighttag>
</copyrightInfo>
<repositoryLocation>$values{'hostname'}</repositoryLocation>
<shortabstract>$values{'shortabstract'}</shortabstract>
</LonCapaResource>
</pre>	</pre>
$values{'extrashow'}	$values{'extrashow'}
<hr align='left' width='200' noshade />	<hr align='left' width='200' noshade />

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

Removed from v.1.207
changed lines
	Added in v.1.215