X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FHeading.pm;h=5dfd0fadb0d903184ca519682ee750fb16ff932a;hb=refs%2Fheads%2Fkoha_ffzg;hp=98bb4a87fcad8e85e8ea0f6035dc48b07c5e1c06;hpb=e7da536551623337aed4ac6f14a127d0f50bd265;p=koha.git

diff --git a/C4/Heading.pm b/C4/Heading.pm
index 98bb4a87fc..5dfd0fadb0 100644
--- a/C4/Heading.pm
+++ b/C4/Heading.pm
@@ -4,28 +4,27 @@ package C4::Heading;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
 
-use strict;
-use warnings;
 use MARC::Record;
 use MARC::Field;
 use C4::Context;
 use Module::Load;
 use Carp;
 
-our $VERSION = 3.00;
 
 =head1 NAME
 
@@ -171,6 +170,22 @@ sub preferred_authorities {
     return $results;
 }
 
+=head2 valid_bib_heading_subfield
+
+    if (C4::Heading::valid_bib_heading_subfield('100', 'e', '')) ...
+
+=cut
+
+sub valid_bib_heading_subfield {
+    my $tag           = shift;
+    my $subfield      = shift;
+    my $marcflavour   = @_ ? shift : C4::Context->preference('marcflavour');
+
+    my $marc_handler = _marc_format_handler($marcflavour);
+
+    return $marc_handler->valid_bib_heading_subfield( $tag, $subfield );
+}
+
 =head1 INTERNAL METHODS
 
 =head2 _search
@@ -201,12 +216,24 @@ sub _search {
     #        push @operator, 'is';
     #        push @value, $self->{'thesaurus'};
     #    }
-    require C4::AuthoritiesMarc;
-    return C4::AuthoritiesMarc::SearchAuthorities(
+
+    require Koha::SearchEngine::QueryBuilder;
+    require Koha::SearchEngine::Search;
+
+    # Use state variables to avoid recreating the objects every time.
+    # With Elasticsearch this also avoids creating a massive amount of
+    # ES connectors that would eventually run out of file descriptors.
+    state $builder = Koha::SearchEngine::QueryBuilder->new(
+        { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+    state $searcher = Koha::SearchEngine::Search->new(
+        {index => $Koha::SearchEngine::AUTHORITIES_INDEX} );
+
+    my $search_query = $builder->build_authorities_query_compat(
         \@marclist, \@and_or, \@excluding, \@operator,
-        \@value,    0,        20,          $self->{'auth_type'},
-        '',         $skipmetadata
+        \@value,    $self->{'auth_type'},
+        'AuthidAsc'
     );
+    return $searcher->search_auth_compat( $search_query, 0, 20, $skipmetadata );
 }
 
 =head1 INTERNAL FUNCTIONS