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 1819-1825 sub GetMarcSubjects { Link Here
1819
    my @marcsubjects;
1819
    my @marcsubjects;
1820
1820
1821
    my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
1821
    my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
1822
    my $authoritysep = C4::Context->preference('authoritysep');
1822
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
1823
1823
1824
    foreach my $field ( $record->field($fields_filter) ) {
1824
    foreach my $field ( $record->field($fields_filter) ) {
1825
        next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);
1825
        next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);
Lines 1865-1871 sub GetMarcSubjects { Link Here
1865
                    code      => $code,
1865
                    code      => $code,
1866
                    value     => $value,
1866
                    value     => $value,
1867
                    link_loop => \@this_link_loop,
1867
                    link_loop => \@this_link_loop,
1868
                    separator => (scalar @subfields_loop) ? $authoritysep : ''
1868
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
1869
                };
1869
                };
1870
            }
1870
            }
1871
        }
1871
        }
Lines 1910-1916 sub GetMarcAuthors { Link Here
1910
    }
1910
    }
1911
1911
1912
    my @marcauthors;
1912
    my @marcauthors;
1913
    my $authoritysep = C4::Context->preference('authoritysep');
1913
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
1914
1914
1915
    foreach my $field ( $record->field($fields_filter) ) {
1915
    foreach my $field ( $record->field($fields_filter) ) {
1916
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
1916
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 1959-1965 sub GetMarcAuthors { Link Here
1959
                    code      => $code,
1959
                    code      => $code,
1960
                    value     => $value,
1960
                    value     => $value,
1961
                    link_loop => \@this_link_loop,
1961
                    link_loop => \@this_link_loop,
1962
                    separator => (scalar @subfields_loop) ? $authoritysep : ''
1962
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
1963
                };
1963
                };
1964
            }
1964
            }
1965
        }
1965
        }
Lines 2058-2064 sub GetMarcSeries { Link Here
2058
    }
2058
    }
2059
2059
2060
    my @marcseries;
2060
    my @marcseries;
2061
    my $authoritysep = C4::Context->preference('authoritysep');
2061
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
2062
2062
2063
    foreach my $field ( $record->field($fields_filter) ) {
2063
    foreach my $field ( $record->field($fields_filter) ) {
2064
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
2064
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 2094-2100 sub GetMarcSeries { Link Here
2094
                    code      => $code,
2094
                    code      => $code,
2095
                    value     => $value,
2095
                    value     => $value,
2096
                    link_loop => \@link_loop,
2096
                    link_loop => \@link_loop,
2097
                    separator => (scalar @subfields_loop) ? $authoritysep : '',
2097
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : '',
2098
                    volumenum => $volume_number,
2098
                    volumenum => $volume_number,
2099
                }
2099
                }
2100
            }
2100
            }
(-)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 37-43 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
37
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
37
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
38
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
38
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
39
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
39
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
40
('authoritysep','--','10','Used to separate a list of authorities in a display. Usually --','free'),
40
('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
41
('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'),
41
('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'),
42
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
42
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
43
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
43
('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 8106-8111 if(CheckVersion($DBversion)) { Link Here
8106
    SetVersion($DBversion);
8106
    SetVersion($DBversion);
8107
}
8107
}
8108
8108
8109
$DBversion = "3.15.00.XXX";
8110
if ( CheckVersion($DBversion) ) {
8111
   $dbh->do("UPDATE systempreferences SET variable = 'AuthoritySeparator' WHERE variable = 'authoritysep'");
8112
   print "Upgrade to $DBversion done (Bug 10330 - Rename system preference authoritysep to AuthoritySeparator)\n";
8113
   SetVersion ($DBversion);
8114
}
8115
8116
8109
=head1 FUNCTIONS
8117
=head1 FUNCTIONS
8110
8118
8111
=head2 TableExists($table)
8119
=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