loncom/interface/lonsearchcat.pm - diff

Return to lonsearchcat.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.331.4.13, 2016/11/09 19:37:39	version 1.331.4.15, 2016/11/15 20:45:19
Line 2455 END	Line 2455 END
## Prepare for the big loop.	## Prepare for the big loop.
my $hitcountsum;	my $hitcountsum;
my $oldhitcountsum;	my $oldhitcountsum;
	my $displaycount;
my %matches;	my %matches;
my $server;	my $server;
my $status;	my $status;
Line 2579 END	Line 2580 END
last if ($connection->aborted());	last if ($connection->aborted());
if ($oldhitcountsum < $hitcountsum) {	if ($oldhitcountsum < $hitcountsum) {
&update_count_status($r,$hitcountsum);	&update_count_status($r,$hitcountsum);
if ($hitcountsum <= $env{'form.show'}) {	if (($hitcountsum <= $env{'form.show'}) \|\|
	(!$displaycount && $hitcountsum)) {
reload_result_frame($r);	reload_result_frame($r);
	$displaycount = $hitcountsum;
}	}
$oldhitcountsum = $hitcountsum;	$oldhitcountsum = $hitcountsum;
}	}
Line 3582 sub display_url {	Line 3585 sub display_url {
$url,	$url,
'preview',	'preview',
'',	'',
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),	'',
$skiplast,$onclick).' ';	$skiplast,$onclick).' ';
# replace the links to open in a new window
# (because the search opens in a new window, it gets
# confusing when the links open a tab in the
# parent window; ideally we should not force windows)
$link =~ s/(href="[^"]*")/\1 onclick="window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;"/g;
}	}
return $link;	return $link;
}	}