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.232 and 1.235

version 1.232, 2004/08/20 15:45:51	version 1.235, 2004/12/17 21:44:19
Line 445 sub hidden_field {	Line 445 sub hidden_field {
{ # Scope the course search to avoid global variables	{ # Scope the course search to avoid global variables
#	#
# Variables For course search	# Variables For course search
my %alreadyseen;
my %hash;	my %hash;
my $totalfound;	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 {	sub course_search {
my $r=shift;	my $r=shift;
my $bodytag=&Apache::loncommon::bodytag('Course Search');	my $bodytag=&Apache::loncommon::bodytag('Course Search');
Line 471 sub course_search {	Line 479 sub course_search {
$bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />');	$bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />');
$r->rflush();	$r->rflush();
# ======================================================= Go through the course	# ======================================================= Go through the course
undef %alreadyseen;
%alreadyseen=();
my $c=$r->connection;	my $c=$r->connection;
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",	if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
&GDBM_READER(),0640)) {	&GDBM_READER(),0640)) {
foreach (keys %hash) {	foreach (sort(keys(%hash))) {
if ($c->aborted()) { last; }	if ($c->aborted()) { last; }
if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {	if (($_=~/^src\_(.+)$/)) {
&checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,	if ($hash{'randomout_'.$1} & !$ENV{'request.role.adv'}) {
@allwords);	next;
	}
	my $symb=&make_symb($1);
	&checkonthis($r,$1,$hash{$_},0,&Apache::lonnet::gettitle($symb),
	$fulltext,$symb,@allwords);
}	}
}	}
untie(%hash);	untie(%hash);
Line 570 sub course_search {	Line 580 sub course_search {
# =============================== This pulls up a resource and its dependencies	# =============================== This pulls up a resource and its dependencies

sub checkonthis {	sub checkonthis {
my ($r,$url,$level,$title,$fulltext,@allwords)=@_;	my ($r,$id,$url,$level,$title,$fulltext,$symb,@allwords)=@_;
$alreadyseen{$url}=1;
$r->rflush();	$r->rflush();
my $result=&Apache::lonnet::metadata($url,'title').' '.
&Apache::lonnet::metadata($url,'subject').' '.	my $result=$title.' ';
&Apache::lonnet::metadata($url,'abstract').' '.	if ($ENV{'request.role.adv'} \|\| !$hash{'encrypted_'.$id}) {
&Apache::lonnet::metadata($url,'keywords');	$result.=&Apache::lonnet::metadata($url,'title').' '.
if (($url) && ($fulltext)) {	&Apache::lonnet::metadata($url,'subject').' '.
$result.=&Apache::lonnet::ssi_body($url);	&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='.&Apache::lonnet::escape($symb));
}	}
$result=~s/\s+/ /gs;	$result=~s/\s+/ /gs;
my $applies = 0;	my $applies = 0;
Line 589 sub checkonthis {	Line 604 sub checkonthis {
for (my $i=0;$i<=$level*5;$i++) {	for (my $i=0;$i<=$level*5;$i++) {
$r->print(' ');	$r->print(' ');
}	}
$r->print('<a href="'.$url.'" target="cat">'.	my $href=$url;
($title?$title:$url).'</a><br />');	if ($hash{'encrypted_'.$id} && !$ENV{'request.role.adv'}) {
	$href=&Apache::lonenc::encrypted($href)
	.'?symb='.&Apache::lonenc::encrypted($symb);
	} else {
	$href.='?symb='.&Apache::lonnet::escape($symb);
	}
	$r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url).
	'</a><br />');
$totalfound++;	$totalfound++;
} elsif ($fulltext) {	} elsif ($fulltext) {
$r->print(' .');	$r->print(' .');
Line 600 sub checkonthis {	Line 622 sub checkonthis {
my $dependencies=	my $dependencies=
&Apache::lonnet::metadata($url,'dependencies');	&Apache::lonnet::metadata($url,'dependencies');
foreach (split(/\,/,$dependencies)) {	foreach (split(/\,/,$dependencies)) {
if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {	if (($_=~/^\/res\//)) {
&checkonthis($r,$_,$level+1,'',$fulltext,@allwords);	&checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords);
}	}
}	}
}	}
Line 659 sub print_basic_search_form {	Line 681 sub print_basic_search_form {
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'})) {
# Define interface components	# Define interface components
my $userelatedwords=	my $userelatedwords= '<label>'.
&mt('[_1] use related words',	&mt('[_1] use related words',
&Apache::lonhtmlcommon::checkbox	&Apache::lonhtmlcommon::checkbox
('related',$ENV{'form.related'},'related'));	('related',$ENV{'form.related'},'related')).'</label>';
my $onlysearchdomain=	my $onlysearchdomain='<label>'.
&mt('[_1] only search domain [_2]',	&mt('[_1] only search domain [_2]',
&Apache::lonhtmlcommon::checkbox('domains',	&Apache::lonhtmlcommon::checkbox('domains',
$ENV{'form.domains'},	$ENV{'form.domains'},
$r->dir_config('lonDefDomain')	$r->dir_config('lonDefDomain')
),	),
$r->dir_config('lonDefDomain')	$r->dir_config('lonDefDomain')
);	).'</label>';
my $adv_search_link =	my $adv_search_link =
'<a href="/adm/searchcat?'.	'<a href="/adm/searchcat?'.
'phase=disp_adv&'.	'phase=disp_adv&'.
Line 752 ENDCOURSESEARCH	Line 774 ENDCOURSESEARCH
$ENV{'form.crsrelated'});	$ENV{'form.crsrelated'});
$scrout.=(<<ENDENDCOURSE);	$scrout.=(<<ENDENDCOURSE);
</td></tr>	</td></tr>
<tr><td>$relcheckbox $lt{'use'}</td><td></td></tr>	<tr><td><label>$relcheckbox $lt{'use'}</label></td><td></td></tr>
<tr><td>$crscheckbox $lt{'full'}</td><td></td></tr>	<tr><td><label>$crscheckbox $lt{'full'}</label></td><td></td></tr>
<tr><td>$discheckbox $lt{'disc'}</td><td></td></tr>	<tr><td><label>$discheckbox $lt{'disc'}</label></td><td></td></tr>
</table><p>	</table><p>
<input type="submit" name="coursesubmit" value='$lt{'srch'}' />	<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
</p>	</p>

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

Removed from v.1.232
changed lines
	Added in v.1.235