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

(-)a/C4/AuthoritiesMarc.pm (-1 / +1 lines)
Lines 268-274 sub SearchAuthorities { Link Here
268
        my $rec=$oAResult->record($counter);
268
        my $rec=$oAResult->record($counter);
269
        my $marcdata=$rec->raw();
269
        my $marcdata=$rec->raw();
270
        my $authrecord;
270
        my $authrecord;
271
        my $separator=C4::Context->preference('authoritysep');
271
        my $separator=C4::Context->preference('AuthoritySeperator');
272
        $authrecord = MARC::File::USMARC::decode($marcdata);
272
        $authrecord = MARC::File::USMARC::decode($marcdata);
273
        my $authid=$authrecord->field('001')->data();
273
        my $authid=$authrecord->field('001')->data();
274
        my %newline;
274
        my %newline;
(-)a/C4/Biblio.pm (-6 / +6 lines)
Lines 1757-1763 sub GetMarcSubjects { Link Here
1757
    my @marcsubjects;
1757
    my @marcsubjects;
1758
1758
1759
    my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
1759
    my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
1760
    my $authoritysep = C4::Context->preference('authoritysep');
1760
    my $AuthoritySeperator = C4::Context->preference('AuthoritySeperator');
1761
1761
1762
    foreach my $field ( $record->field($fields_filter) ) {
1762
    foreach my $field ( $record->field($fields_filter) ) {
1763
        next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);
1763
        next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);
Lines 1803-1809 sub GetMarcSubjects { Link Here
1803
                    code      => $code,
1803
                    code      => $code,
1804
                    value     => $value,
1804
                    value     => $value,
1805
                    link_loop => \@this_link_loop,
1805
                    link_loop => \@this_link_loop,
1806
                    separator => (scalar @subfields_loop) ? $authoritysep : ''
1806
                    separator => (scalar @subfields_loop) ? $AuthoritySeperator : ''
1807
                };
1807
                };
1808
            }
1808
            }
1809
        }
1809
        }
Lines 1844-1850 sub GetMarcAuthors { Link Here
1844
    }
1844
    }
1845
1845
1846
    my @marcauthors;
1846
    my @marcauthors;
1847
    my $authoritysep = C4::Context->preference('authoritysep');
1847
    my $AuthoritySeperator = C4::Context->preference('AuthoritySeperator');
1848
1848
1849
    foreach my $field ( $record->field($fields_filter) ) {
1849
    foreach my $field ( $record->field($fields_filter) ) {
1850
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
1850
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 1893-1899 sub GetMarcAuthors { Link Here
1893
                    code      => $code,
1893
                    code      => $code,
1894
                    value     => $value,
1894
                    value     => $value,
1895
                    link_loop => \@this_link_loop,
1895
                    link_loop => \@this_link_loop,
1896
                    separator => (scalar @subfields_loop) ? $authoritysep : ''
1896
                    separator => (scalar @subfields_loop) ? $AuthoritySeperator : ''
1897
                };
1897
                };
1898
            }
1898
            }
1899
        }
1899
        }
Lines 1983-1989 sub GetMarcSeries { Link Here
1983
    }
1983
    }
1984
1984
1985
    my @marcseries;
1985
    my @marcseries;
1986
    my $authoritysep = C4::Context->preference('authoritysep');
1986
    my $AuthoritySeperator = C4::Context->preference('AuthoritySeperator');
1987
1987
1988
    foreach my $field ( $record->field($fields_filter) ) {
1988
    foreach my $field ( $record->field($fields_filter) ) {
1989
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
1989
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 2019-2025 sub GetMarcSeries { Link Here
2019
                    code      => $code,
2019
                    code      => $code,
2020
                    value     => $value,
2020
                    value     => $value,
2021
                    link_loop => \@link_loop,
2021
                    link_loop => \@link_loop,
2022
                    separator => (scalar @subfields_loop) ? $authoritysep : '',
2022
                    separator => (scalar @subfields_loop) ? $AuthoritySeperator : '',
2023
                    volumenum => $volume_number,
2023
                    volumenum => $volume_number,
2024
                }
2024
                }
2025
            }
2025
            }
(-)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 $AuthoritySeperator = C4::Context->preference("AuthoritySeperator");
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 $AuthoritySeperator = C4::Context->preference("AuthoritySeperator");
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 8-14 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
8
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,'');
8
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonymousPatron', '0', 'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',NULL,'');
9
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Babeltheque',0,'Turn ON Babeltheque content  - See babeltheque.com to subscribe to this service','','YesNo');
9
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Babeltheque',0,'Turn ON Babeltheque content  - See babeltheque.com to subscribe to this service','','YesNo');
10
10
11
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','Used to separate a list of authorities in a display. Usually --',10,'free');
11
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AuthoritySeperator','--','Used to separate a list of authorities in a display. Usually --',10,'free');
12
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoBarcode','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','incremental|annual|hbyymmincr|EAN13|OFF','Choice');
12
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoBarcode','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','incremental|annual|hbyymmincr|EAN13|OFF','Choice');
13
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoLocation',0,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses',NULL,'YesNo');
13
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoLocation',0,'If ON, IP authentication is enabled, blocking access to the staff client from unauthorized IP addresses',NULL,'YesNo');
14
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutomaticItemReturn',1,'If ON, Koha will automatically set up a transfer of this item to its homebranch',NULL,'YesNo');
14
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutomaticItemReturn',1,'If ON, Koha will automatically set up a transfer of this item to its homebranch',NULL,'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 6971-6976 if(CheckVersion($DBversion)) { Link Here
6971
    SetVersion ($DBversion);
6971
    SetVersion ($DBversion);
6972
}
6972
}
6973
6973
6974
$DBversion = "3.13.00.XXX";
6975
if ( CheckVersion($DBversion) ) {
6976
   $dbh->do("UPDATE systempreferences SET variable = 'AuthoritySeperator' WHERE variable = 'authoritysep'");
6977
   print "Upgrade to $DBversion done (Bug 10330 - Rename system preference authoritysep to AuthoritySeperator)\n";
6978
   SetVersion ($DBversion);
6979
}
6980
6974
=head1 FUNCTIONS
6981
=head1 FUNCTIONS
6975
6982
6976
=head2 TableExists($table)
6983
=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: AuthoritySeperator
116
              class: short
116
              class: short
117
            - '.'
117
            - '.'
118
        -
118
        -
119
- 

Return to bug 10330