--- loncom/interface/lonsearchcat.pm 2016/11/09 19:37:39 1.331.4.13 +++ loncom/interface/lonsearchcat.pm 2016/11/15 20:45:19 1.331.4.15 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.331.4.13 2016/11/09 19:37:39 raeburn Exp $ +# $Id: lonsearchcat.pm,v 1.331.4.15 2016/11/15 20:45:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2455,6 +2455,7 @@ END ## Prepare for the big loop. my $hitcountsum; my $oldhitcountsum; + my $displaycount; my %matches; my $server; my $status; @@ -2579,8 +2580,10 @@ END last if ($connection->aborted()); if ($oldhitcountsum < $hitcountsum) { &update_count_status($r,$hitcountsum); - if ($hitcountsum <= $env{'form.show'}) { + if (($hitcountsum <= $env{'form.show'}) || + (!$displaycount && $hitcountsum)) { reload_result_frame($r); + $displaycount = $hitcountsum; } $oldhitcountsum = $hitcountsum; } @@ -3582,13 +3585,8 @@ sub display_url { $url, 'preview', '', - (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''), + '', $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; }