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

(-)a/C4/AuthoritiesMarc.pm (-1 / +1 lines)
Lines 266-272 sub SearchAuthorities { Link Here
266
        
266
        
267
        ##Here we have to extract MARC record and $authid from ZEBRA AUTHORITIES
267
        ##Here we have to extract MARC record and $authid from ZEBRA AUTHORITIES
268
        my $rec=$oAResult->record($counter);
268
        my $rec=$oAResult->record($counter);
269
        my $separator=C4::Context->preference('authoritysep');
269
        my $separator=C4::Context->preference('AuthoritySeparator');
270
        my $authrecord = C4::Search::new_record_from_zebra(
270
        my $authrecord = C4::Search::new_record_from_zebra(
271
            'authorityserver',
271
            'authorityserver',
272
            $rec->raw()
272
            $rec->raw()
(-)a/C4/Biblio.pm (-6 / +6 lines)
Lines 1808-1814 sub GetMarcSubjects { Link Here
1808
    my @marcsubjects;
1808
    my @marcsubjects;
1809
1809
1810
    my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
1810
    my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
1811
    my $authoritysep = C4::Context->preference('authoritysep');
1811
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
1812
1812
1813
    foreach my $field ( $record->field($fields_filter) ) {
1813
    foreach my $field ( $record->field($fields_filter) ) {
1814
        next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);
1814
        next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);
Lines 1854-1860 sub GetMarcSubjects { Link Here
1854
                    code      => $code,
1854
                    code      => $code,
1855
                    value     => $value,
1855
                    value     => $value,
1856
                    link_loop => \@this_link_loop,
1856
                    link_loop => \@this_link_loop,
1857
                    separator => (scalar @subfields_loop) ? $authoritysep : ''
1857
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
1858
                };
1858
                };
1859
            }
1859
            }
1860
        }
1860
        }
Lines 1899-1905 sub GetMarcAuthors { Link Here
1899
    }
1899
    }
1900
1900
1901
    my @marcauthors;
1901
    my @marcauthors;
1902
    my $authoritysep = C4::Context->preference('authoritysep');
1902
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
1903
1903
1904
    foreach my $field ( $record->field($fields_filter) ) {
1904
    foreach my $field ( $record->field($fields_filter) ) {
1905
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
1905
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 1948-1954 sub GetMarcAuthors { Link Here
1948
                    code      => $code,
1948
                    code      => $code,
1949
                    value     => $value,
1949
                    value     => $value,
1950
                    link_loop => \@this_link_loop,
1950
                    link_loop => \@this_link_loop,
1951
                    separator => (scalar @subfields_loop) ? $authoritysep : ''
1951
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
1952
                };
1952
                };
1953
            }
1953
            }
1954
        }
1954
        }
Lines 2047-2053 sub GetMarcSeries { Link Here
2047
    }
2047
    }
2048
2048
2049
    my @marcseries;
2049
    my @marcseries;
2050
    my $authoritysep = C4::Context->preference('authoritysep');
2050
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
2051
2051
2052
    foreach my $field ( $record->field($fields_filter) ) {
2052
    foreach my $field ( $record->field($fields_filter) ) {
2053
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
2053
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 2083-2089 sub GetMarcSeries { Link Here
2083
                    code      => $code,
2083
                    code      => $code,
2084
                    value     => $value,
2084
                    value     => $value,
2085
                    link_loop => \@link_loop,
2085
                    link_loop => \@link_loop,
2086
                    separator => (scalar @subfields_loop) ? $authoritysep : '',
2086
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : '',
2087
                    volumenum => $volume_number,
2087
                    volumenum => $volume_number,
2088
                }
2088
                }
2089
            }
2089
            }
(-)a/cataloguing/value_builder/unimarc_field_210c_bis.pl (-1 / +1 lines)
Lines 88-94 sub plugin { Link Here
88
    my $index        = $input->param('index');
88
    my $index        = $input->param('index');
89
    my $result       = $input->param('result');
89
    my $result       = $input->param('result');
90
    my $editor_found = $input->param('editor_found');
90
    my $editor_found = $input->param('editor_found');
91
    my $authoritysep = C4::Context->preference("authoritysep");
91
    my $AuthoritySeparator = C4::Context->preference("AuthoritySeparator");
92
    warn Data::Dumper::Dumper $index;
92
    warn Data::Dumper::Dumper $index;
93
93
94
    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
94
    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
(-)a/cataloguing/value_builder/unimarc_field_225a.pl (-1 / +1 lines)
Lines 108-114 sub plugin { Link Here
108
    my $index        = $input->param('index');
108
    my $index        = $input->param('index');
109
    my $result       = $input->param('result');
109
    my $result       = $input->param('result');
110
    my $editor_found = $input->param('editor_found');
110
    my $editor_found = $input->param('editor_found');
111
    my $authoritysep = C4::Context->preference("authoritysep");
111
    my $AuthoritySeparator = C4::Context->preference("AuthoritySeparator");
112
    
112
    
113
    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
113
    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
114
        {
114
        {
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 39-45 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
39
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
39
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
40
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
40
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
41
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
41
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
42
('authoritysep','--','10','Used to separate a list of authorities in a display. Usually --','free'),
42
('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
43
('autoBarcode','OFF','incremental|annual|hbyymmincr|EAN13|OFF','Used to autogenerate a barcode: incremental will be of the form 1, 2, 3; annual of the form 2007-0001, 2007-0002; hbyymmincr of the form HB08010001 where HB=Home Branch','Choice'),
43
('autoBarcode','OFF','incremental|annual|hbyymmincr|EAN13|OFF','Used to autogenerate a barcode: incremental will be of the form 1, 2, 3; annual of the form 2007-0001, 2007-0002; hbyymmincr of the form HB08010001 where HB=Home Branch','Choice'),
44
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
44
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
45
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
45
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 8243-8248 if ( CheckVersion($DBversion) ) { Link Here
8243
    SetVersion ($DBversion);
8243
    SetVersion ($DBversion);
8244
}
8244
}
8245
8245
8246
$DBversion = "3.15.00.XXX";
8247
if ( CheckVersion($DBversion) ) {
8248
   $dbh->do("UPDATE systempreferences SET variable = 'AuthoritySeparator' WHERE variable = 'authoritysep'");
8249
   print "Upgrade to $DBversion done (Bug 10330 - Rename system preference authoritysep to AuthoritySeparator)\n";
8250
   SetVersion ($DBversion);
8251
}
8252
8246
=head1 FUNCTIONS
8253
=head1 FUNCTIONS
8247
8254
8248
=head2 TableExists($table)
8255
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (-2 / +1 lines)
Lines 112-118 Cataloging: Link Here
112
    Display:
112
    Display:
113
        -
113
        -
114
            - 'Separate multiple displayed authors, series or subjects with '
114
            - 'Separate multiple displayed authors, series or subjects with '
115
            - pref: authoritysep
115
            - pref: AuthoritySeparator
116
              class: short
116
              class: short
117
            - '.'
117
            - '.'
118
        -
118
        -
119
- 

Return to bug 10330