ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / C4 / Heading.pm

diff --git a/C4/Heading.pm b/C4/Heading.pm
index e323b5b..5dfd0fa 100644 (file)
--- a/C4/Heading.pm
+++ b/C4/Heading.pm
@@ -17,8 +17,8 @@ package C4::Heading;
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
+
 use MARC::Record;
 use MARC::Field;
 use C4::Context;
@@ -170,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
@@ -200,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'},
-        'AuthidAsc',         $skipmetadata
+        \@value,    $self->{'auth_type'},
+        'AuthidAsc'
     );
+    return $searcher->search_auth_compat( $search_query, 0, 20, $skipmetadata );
 }
 
 =head1 INTERNAL FUNCTIONS