Attachment #106759 for bug #25273

View | Details | Raw Unified | Return to bug 25273
Collapse All | Expand All

Lines 628-634 sub AddAuthority { Link Here

(-)a/C4/AuthoritiesMarc.pm (-1 / +1 lines)
628	$record->insert_fields_ordered( MARC::Field->new( '001', $authid ) );	628	$record->insert_fields_ordered( MARC::Field->new( '001', $authid ) );
629	# Update	629	# Update
630	$dbh->do( "UPDATE auth_header SET authtypecode=?, marc=?, marcxml=? WHERE authid=?", undef, $authtypecode, $record->as_usmarc, $record->as_xml_record($format), $authid ) or die $DBI::errstr;	630	$dbh->do( "UPDATE auth_header SET authtypecode=?, marc=?, marcxml=? WHERE authid=?", undef, $authtypecode, $record->as_usmarc, $record->as_xml_record($format), $authid ) or die $DBI::errstr;
631	ModZebra( $authid, 'specialUpdate', 'authorityserver', { record => $record, authtypecode => $authtypecode } );	631	ModZebra( $authid, 'specialUpdate', 'authorityserver', $record );
632		632
633	return ( $authid );	633	return ( $authid );
634	}	634	}





$server is the server that we want to update

$record is the updated MARC record. If it's not supplied 
and is needed it will be loaded from the database.

=cut


            }
        );
        if ( $op eq 'specialUpdate' ) {
            unless ($record) {
                $indexer->update_index_background( [$biblionumber], [$record] );
            } else {
                $record = GetMarcBiblio({
                    biblionumber => $biblionumber,
                    embed_items  => 1 });
                $indexer->update_index_background( [$biblionumber], [{ record => $record }] );
            }
            $indexer->update_index_background( [$biblionumber], [$record] );
        }
        elsif ( $op eq 'recordDelete' ) {
            $indexer->delete_index_background( [$biblionumber] );




use Koha::SearchMarcMaps;
use Koha::Caches;
use C4::Heading;
use C4::AuthoritiesMarc;

use Carp;
use Clone qw(clone);

    foreach my $record (@{$records}) {
        my $record_document = {};

        if ( $self->index eq 'authorities' ){
            my $authtypecode = GuessAuthTypeCode( $record );
            my $field = $record->field( $auth_match_headings{ $authtypecode } );
            my $heading = C4::Heading->new_from_field( $field, undef, 1 ); #new auth heading
            push @{$record_document->{'match-heading'}}, $heading->search_form if $heading;
        }
        $record = $record->{record};

        my $mappings = $rules->{leader};
        if ($mappings) {




    _log(1, "Indexing authorities\n");
    if (@authids) {
        $next = sub {
            warn "we called;";
            my $r = shift @authids;
            return () unless defined $r;
            my $a = Koha::MetadataRecord::Authority->get_from_authid($r);

    my $commit_count = $commit;
    my ( @id_buffer, @commit_buffer );
    while ( my $record = $next->() ) {
        my $id     = $record->id // $record->authid;
        my $record = $record->record;
        $record_prepped->{authtypecode} = $record->authtypecode if ref $record eq 'Koha::MetadataRecord::Authority';
        $record_prepped->{record} = $record->record;
        $count++;
        if ( $verbose == 1 ) {
            _log( 1, "$count records processed\n" ) if ( $count % 1000 == 0);

        }

        push @id_buffer,     $id;
        push @commit_buffer, $record;
        if ( !( --$commit_count ) ) {
            _log( 1, "Committing $commit records...\n" );
            my $response = $indexer->update_index( \@id_buffer, \@commit_buffer );




        MARC::Field->new('999', '', '', c => '1234568'),
        MARC::Field->new('952', '', '', 0 => 1, g => 'string where should be numeric', o => $long_callno),
    );
    my $records = [ $marc_record_1, $marc_record_2 ];
        { record => $marc_record_1 },
        { record => $marc_record_2 },
    ];

    $see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first


        $large_marc_record->append_fields($item_field);
    }

    $docs = $see->marc_records_to_documents([$large_marc_record]);

    is($docs->[0]->{marc_format}, 'MARCXML', 'For record exceeding max record size marc_format should be set correctly');


        MARC::Field->new('999', '', '', c => '1234568'),
        MARC::Field->new('952', '', '', 0 => 1, g => 'string where should be numeric'),
    );
    my $records = [ $marc_record_1, $marc_record_2 ];
        { record => $marc_record_1 },
        { record => $marc_record_2 },
    ];

    $see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first


    $marc_record_2->append_fields(
        MARC::Field->new('150', '', '', a => 'Subject', v => 'Genresubdiv', z => 'Geosubdiv', x => 'Generalsubdiv', e => 'wrongsubdiv' ),
    );
    my $records = [ $marc_record_1, $marc_record_2 ];
        { record => $marc_record_1, authtypecode=> $auth_type->authtypecode },
        { record => $marc_record_2, authtypecode=> $auth_type->authtypecode },
    ];

    $see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first

- 

Return to bug 25273

Lines 2545-2552 $op is specialUpdate or recordDelete, and is used to know what we want to do Link Here

(-)a/C4/Biblio.pm (-6 / +4 lines)
2545		2545
2546	$server is the server that we want to update	2546	$server is the server that we want to update
2547		2547
2548	$record is a hash including the authtypecode and updated MARC record. This is only used for	2548	$record is the updated MARC record. If it's not supplied
2549	Elasticsearch authorities. If it's not supplied a biblio will be loaded from the database.	2549	and is needed it will be loaded from the database.
2550		2550
2551	=cut	2551	=cut
2552		2552
Lines 2566-2579 sub ModZebra { Link Here
2566	}	2566	}
2567	);	2567	);
2568	if ( $op eq 'specialUpdate' ) {	2568	if ( $op eq 'specialUpdate' ) {
2569	if ($record) {	2569	unless ($record) {
2570	$indexer->update_index_background( [$biblionumber], [$record] );
2571	} else {
2572	$record = GetMarcBiblio({	2570	$record = GetMarcBiblio({
2573	biblionumber => $biblionumber,	2571	biblionumber => $biblionumber,
2574	embed_items => 1 });	2572	embed_items => 1 });
2575	$indexer->update_index_background( [$biblionumber], [{ record => $record }] );
2576	}	2573	}
		2574	$indexer->update_index_background( [$biblionumber], [$record] );
2577	}	2575	}
2578	elsif ( $op eq 'recordDelete' ) {	2576	elsif ( $op eq 'recordDelete' ) {
2579	$indexer->delete_index_background( [$biblionumber] );	2577	$indexer->delete_index_background( [$biblionumber] );

Lines 204-209 if ($index_authorities) { Link Here

(-)a/misc/search_tools/rebuild_elasticsearch.pl (-5 / +4 lines)
204	_log(1, "Indexing authorities\n");	204	_log(1, "Indexing authorities\n");
205	if (@authids) {	205	if (@authids) {
206	$next = sub {	206	$next = sub {
		207	warn "we called;";
207	my $r = shift @authids;	208	my $r = shift @authids;
208	return () unless defined $r;	209	return () unless defined $r;
209	my $a = Koha::MetadataRecord::Authority->get_from_authid($r);	210	my $a = Koha::MetadataRecord::Authority->get_from_authid($r);
Lines 275-284 sub _do_reindex { Link Here
275	my $commit_count = $commit;	276	my $commit_count = $commit;
276	my ( @id_buffer, @commit_buffer );	277	my ( @id_buffer, @commit_buffer );
277	while ( my $record = $next->() ) {	278	while ( my $record = $next->() ) {
278	my $id = $record->id;	279	my $id = $record->id // $record->authid;
279	my $record_prepped;	280	my $record = $record->record;
280	$record_prepped->{authtypecode} = $record->authtypecode if ref $record eq 'Koha::MetadataRecord::Authority';
281	$record_prepped->{record} = $record->record;
282	$count++;	281	$count++;
283	if ( $verbose == 1 ) {	282	if ( $verbose == 1 ) {
284	_log( 1, "$count records processed\n" ) if ( $count % 1000 == 0);	283	_log( 1, "$count records processed\n" ) if ( $count % 1000 == 0);
Lines 287-293 sub _do_reindex { Link Here
287	}	286	}
288		287
289	push @id_buffer, $id;	288	push @id_buffer, $id;
290	push @commit_buffer, $record_prepped;	289	push @commit_buffer, $record;
291	if ( !( --$commit_count ) ) {	290	if ( !( --$commit_count ) ) {
292	_log( 1, "Committing $commit records...\n" );	291	_log( 1, "Committing $commit records...\n" );
293	my $response = $indexer->update_index( \@id_buffer, \@commit_buffer );	292	my $response = $indexer->update_index( \@id_buffer, \@commit_buffer );

Lines 340-349 subtest 'Koha::SearchEngine::Elasticsearch::marc_records_to_documents () tests' Link Here

(-)a/t/db_dependent/Koha/SearchEngine/Elasticsearch.t (-14 / +4 lines)
340	MARC::Field->new('999', '', '', c => '1234568'),	340	MARC::Field->new('999', '', '', c => '1234568'),
341	MARC::Field->new('952', '', '', 0 => 1, g => 'string where should be numeric', o => $long_callno),	341	MARC::Field->new('952', '', '', 0 => 1, g => 'string where should be numeric', o => $long_callno),
342	);	342	);
343	my $records = [	343	my $records = [ $marc_record_1, $marc_record_2 ];
344	{ record => $marc_record_1 },
345	{ record => $marc_record_2 },
346	];
347		344
348	$see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first	345	$see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first
349		346
Lines 510-516 subtest 'Koha::SearchEngine::Elasticsearch::marc_records_to_documents () tests' Link Here
510	$large_marc_record->append_fields($item_field);	507	$large_marc_record->append_fields($item_field);
511	}	508	}
512		509
513	$docs = $see->marc_records_to_documents([{ record => $large_marc_record }]);	510	$docs = $see->marc_records_to_documents([$large_marc_record]);
514		511
515	is($docs->[0]->{marc_format}, 'MARCXML', 'For record exceeding max record size marc_format should be set correctly');	512	is($docs->[0]->{marc_format}, 'MARCXML', 'For record exceeding max record size marc_format should be set correctly');
516		513
Lines 623-632 subtest 'Koha::SearchEngine::Elasticsearch::marc_records_to_documents_array () t Link Here
623	MARC::Field->new('999', '', '', c => '1234568'),	620	MARC::Field->new('999', '', '', c => '1234568'),
624	MARC::Field->new('952', '', '', 0 => 1, g => 'string where should be numeric'),	621	MARC::Field->new('952', '', '', 0 => 1, g => 'string where should be numeric'),
625	);	622	);
626	my $records = [	623	my $records = [ $marc_record_1, $marc_record_2 ];
627	{ record => $marc_record_1 },
628	{ record => $marc_record_2 },
629	];
630		624
631	$see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first	625	$see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first
632		626
Lines 701-710 subtest 'Koha::SearchEngine::Elasticsearch::marc_records_to_documents () authori Link Here
701	$marc_record_2->append_fields(	695	$marc_record_2->append_fields(
702	MARC::Field->new('150', '', '', a => 'Subject', v => 'Genresubdiv', z => 'Geosubdiv', x => 'Generalsubdiv', e => 'wrongsubdiv' ),	696	MARC::Field->new('150', '', '', a => 'Subject', v => 'Genresubdiv', z => 'Geosubdiv', x => 'Generalsubdiv', e => 'wrongsubdiv' ),
703	);	697	);
704	my $records = [	698	my $records = [ $marc_record_1, $marc_record_2 ];
705	{ record => $marc_record_1, authtypecode=> $auth_type->authtypecode },
706	{ record => $marc_record_2, authtypecode=> $auth_type->authtypecode },
707	];
708		699
709	$see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first	700	$see->get_elasticsearch_mappings(); #sort_fields will call this and use the actual db values unless we call it first
710		701
711	-

Lines 28-33 use Koha::SearchFields; Link Here

(-)a/Koha/SearchEngine/Elasticsearch.pm (-3 / +4 lines)
28	use Koha::SearchMarcMaps;	28	use Koha::SearchMarcMaps;
29	use Koha::Caches;	29	use Koha::Caches;
30	use C4::Heading;	30	use C4::Heading;
		31	use C4::AuthoritiesMarc;
31		32
32	use Carp;	33	use Carp;
33	use Clone qw(clone);	34	use Clone qw(clone);
Lines 536-547 sub marc_records_to_documents { Link Here
536	foreach my $record (@{$records}) {	537	foreach my $record (@{$records}) {
537	my $record_document = {};	538	my $record_document = {};
538		539
539	if ( defined $record->{authtypecode} ){	540	if ( $self->index eq 'authorities' ){
540	my $field = $record->{record}->field( $auth_match_headings{ $record->{authtypecode} } );	541	my $authtypecode = GuessAuthTypeCode( $record );
		542	my $field = $record->field( $auth_match_headings{ $authtypecode } );
541	my $heading = C4::Heading->new_from_field( $field, undef, 1 ); #new auth heading	543	my $heading = C4::Heading->new_from_field( $field, undef, 1 ); #new auth heading
542	push @{$record_document->{'match-heading'}}, $heading->search_form if $heading;	544	push @{$record_document->{'match-heading'}}, $heading->search_form if $heading;
543	}	545	}
544	$record = $record->{record};
545		546
546	my $mappings = $rules->{leader};	547	my $mappings = $rules->{leader};
547	if ($mappings) {	548	if ($mappings) {