Bug 6875 de-nesting C4::Heading

C4::Search is needed only in authorities sub, moving it here and switching to
require

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected call to SimpleSearch in both subs where it is used. Additional
performance improvements are included in bug 7284. 28 Jan 2012
This commit is contained in:
Paul Poulain 2011-09-16 19:38:06 +02:00
parent c52f0b7fdf
commit 58c46b27af
1 changed files with 4 additions and 3 deletions

View File

@ -23,7 +23,6 @@ use MARC::Record;
use MARC::Field;
use C4::Context;
use C4::Heading::MARC21;
use C4::Search;
use Carp;
our $VERSION = 3.00;
@ -109,7 +108,8 @@ sub authorities {
my $self = shift;
my $query = qq(Match-heading,do-not-truncate,ext="$self->{'search_form'}");
$query .= $self->_query_limiters();
my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
require C4::Search;
my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
if (defined $error) {
carp "Error:$error from search $query";
}
@ -129,7 +129,8 @@ sub preferred_authorities {
my $self = shift;
my $query = "Match-heading-see-from,do-not-truncate,ext='$self->{'search_form'}'";
$query .= $self->_query_limiters();
my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
require C4::Search;
my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
if (defined $error) {
carp "Error:$error from search $query";
}