From 0e61cfb3a591aec28521f2fdd1a76fea904721ca Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Fri, 16 Sep 2011 19:38:06 +0200 Subject: [PATCH] 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 Corrected call to SimpleSearch in both subs where it is used. Additional performance improvements are included in bug 7284. 28 Jan 2012 (cherry picked from commit 58c46b27af601a893e1eabdfb5bd7d4d0d887f24) Signed-off-by: Chris Nighswonger --- C4/Heading.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/C4/Heading.pm b/C4/Heading.pm index ba9d23f6e0..d9e13d4223 100644 --- a/C4/Heading.pm +++ b/C4/Heading.pm @@ -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"; } -- 2.39.5