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

(-)a/C4/Context.pm (-1 / +1 lines)
Lines 720-726 sub _new_Zconn { Link Here
720
    $server //= "biblioserver";
720
    $server //= "biblioserver";
721
721
722
    if ( $server eq 'biblioserver' ) {
722
    if ( $server eq 'biblioserver' ) {
723
        $index_mode = $context->{'config'}->{'zebra_bib_index_mode'} // 'grs1';
723
        $index_mode = $context->{'config'}->{'zebra_bib_index_mode'} // 'dom';
724
    } elsif ( $server eq 'authorityserver' ) {
724
    } elsif ( $server eq 'authorityserver' ) {
725
        $index_mode = $context->{'config'}->{'zebra_auth_index_mode'} // 'dom';
725
        $index_mode = $context->{'config'}->{'zebra_auth_index_mode'} // 'dom';
726
    }
726
    }
(-)a/C4/Search.pm (-1 / +1 lines)
Lines 2592-2598 sub new_record_from_zebra { Link Here
2592
    my $raw_data = shift;
2592
    my $raw_data = shift;
2593
    # Set the default indexing modes
2593
    # Set the default indexing modes
2594
    my $index_mode = ( $server eq 'biblioserver' )
2594
    my $index_mode = ( $server eq 'biblioserver' )
2595
                        ? C4::Context->config('zebra_bib_index_mode') // 'grs1'
2595
                        ? C4::Context->config('zebra_bib_index_mode') // 'dom'
2596
                        : C4::Context->config('zebra_auth_index_mode') // 'dom';
2596
                        : C4::Context->config('zebra_auth_index_mode') // 'dom';
2597
2597
2598
    my $marc_record =  eval {
2598
    my $marc_record =  eval {
(-)a/Makefile.PL (-4 / +4 lines)
Lines 960-969 Primary language for Zebra indexing); Link Here
960
Koha can use one of  two different indexing modes
960
Koha can use one of  two different indexing modes
961
for the MARC bibliographic records:
961
for the MARC bibliographic records:
962
962
963
grs1 - uses the Zebra GRS-1 filter, available
964
       for legacy support
965
dom  - uses the DOM XML filter; offers improved
963
dom  - uses the DOM XML filter; offers improved
966
       functionality.
964
       functionality.
965
grs1 - [DEPRECATED] uses the Zebra GRS-1 filter,
966
       available for legacy support
967
967
968
Bibliographic indexing mode);
968
Bibliographic indexing mode);
969
    $msg .= _add_valid_values_disp('BIB_INDEX_MODE', $valid_values);
969
    $msg .= _add_valid_values_disp('BIB_INDEX_MODE', $valid_values);
Lines 974-983 Bibliographic indexing mode); Link Here
974
Koha can use one of  two different indexing modes
974
Koha can use one of  two different indexing modes
975
for the MARC authorities records:
975
for the MARC authorities records:
976
976
977
grs1 - uses the Zebra GRS-1 filter, available
978
       for legacy support
979
dom  - uses the DOM XML filter; offers improved
977
dom  - uses the DOM XML filter; offers improved
980
       functionality.
978
       functionality.
979
grs1 - [DEPRECATED] uses the Zebra GRS-1 filter,
980
       available for legacy support
981
981
982
Authorities indexing mode);
982
Authorities indexing mode);
983
    $msg .= _add_valid_values_disp('AUTH_INDEX_MODE', $valid_values);
983
    $msg .= _add_valid_values_disp('AUTH_INDEX_MODE', $valid_values);
(-)a/misc/migration_tools/rebuild_zebra.pl (-2 / +2 lines)
Lines 152-159 my $biblioserverdir = C4::Context->zebraconfig('biblioserver')->{directory}; Link Here
152
my $authorityserverdir = C4::Context->zebraconfig('authorityserver')->{directory};
152
my $authorityserverdir = C4::Context->zebraconfig('authorityserver')->{directory};
153
153
154
my $kohadir = C4::Context->config('intranetdir');
154
my $kohadir = C4::Context->config('intranetdir');
155
my $bib_index_mode = C4::Context->config('zebra_bib_index_mode') || 'grs1';
155
my $bib_index_mode  = C4::Context->config('zebra_bib_index_mode')  // 'dom';
156
my $auth_index_mode = C4::Context->config('zebra_auth_index_mode') || 'dom';
156
my $auth_index_mode = C4::Context->config('zebra_auth_index_mode') // 'dom';
157
157
158
my $dbh = C4::Context->dbh;
158
my $dbh = C4::Context->dbh;
159
my ($biblionumbertagfield,$biblionumbertagsubfield) = &GetMarcFromKohaField("biblio.biblionumber","");
159
my ($biblionumbertagfield,$biblionumbertagsubfield) = &GetMarcFromKohaField("biblio.biblionumber","");
(-)a/t/db_dependent/zebra_config.pl (-2 / +1 lines)
Lines 10-16 use File::Spec; Link Here
10
my $source = File::Spec->rel2abs('.');
10
my $source = File::Spec->rel2abs('.');
11
my $destination = $ARGV[0];
11
my $destination = $ARGV[0];
12
my $marc_type = $ARGV[1] || 'marc21';
12
my $marc_type = $ARGV[1] || 'marc21';
13
my $indexing_mode = $ARGV[2] || 'grs1';
13
my $indexing_mode = $ARGV[2] || 'dom';
14
14
15
$ENV{__BIB_INDEX_MODE__} = $indexing_mode;
15
$ENV{__BIB_INDEX_MODE__} = $indexing_mode;
16
$ENV{__AUTH_INDEX_MODE__} = $indexing_mode;
16
$ENV{__AUTH_INDEX_MODE__} = $indexing_mode;
17
- 

Return to bug 12651