Attachment #28118 for bug #10330

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

Lines 266-272 sub SearchAuthorities { Link Here

(-)a/C4/AuthoritiesMarc.pm (-1 / +1 lines)
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()




    my @marcsubjects;

    my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');

    foreach my $field ( $record->field($fields_filter) ) {
        next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);

                    code      => $code,
                    value     => $value,
                    link_loop => \@this_link_loop,
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
                };
            }
        }

    }

    my @marcauthors;
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');

    foreach my $field ( $record->field($fields_filter) ) {
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;

                    code      => $code,
                    value     => $value,
                    link_loop => \@this_link_loop,
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
                };
            }
        }

    }

    my @marcseries;
    my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');

    foreach my $field ( $record->field($fields_filter) ) {
        next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;

                    code      => $code,
                    value     => $value,
                    link_loop => \@link_loop,
                    separator => (scalar @subfields_loop) ? $AuthoritySeparator : '',
                    volumenum => $volume_number,
                }
            }

Lines 88-94 sub plugin { Link Here

(-)a/cataloguing/value_builder/unimarc_field_210c_bis.pl (-1 / +1 lines)
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(

Lines 108-114 sub plugin { Link Here

(-)a/cataloguing/value_builder/unimarc_field_225a.pl (-1 / +1 lines)
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	{

Lines 40-46 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
40	('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),	40	('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),
41	('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),	41	('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
42	('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),	42	('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
43	('authoritysep','--','10','Used to separate a list of authorities in a display. Usually --','free'),	43	('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
44	('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	('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'),
45	('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),	45	('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
46	('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),	46	('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),

Lines 8465-8470 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
8465	SetVersion($DBversion);	8465	SetVersion($DBversion);
8466	}	8466	}
8467		8467
		8468	$DBversion = "3.15.00.XXX";
		8469	if ( CheckVersion($DBversion) ) {
		8470	$dbh->do("UPDATE systempreferences SET variable = 'AuthoritySeparator' WHERE variable = 'authoritysep'");
		8471	print "Upgrade to $DBversion done (Bug 10330 - Rename system preference authoritysep to AuthoritySeparator)\n";
		8472	SetVersion ($DBversion);
		8473	}
		8474
8468	=head1 FUNCTIONS	8475	=head1 FUNCTIONS
8469		8476
8470	=head2 TableExists($table)	8477	=head2 TableExists($table)

Lines 112-118 Cataloging: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (-2 / +1 lines)
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

Lines 1824-1830 sub GetMarcSubjects { Link Here

(-)a/C4/Biblio.pm (-6 / +6 lines)
1824	my @marcsubjects;	1824	my @marcsubjects;
1825		1825
1826	my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';	1826	my $subject_limit = C4::Context->preference("TraceCompleteSubfields") ? 'su,complete-subfield' : 'su';
1827	my $authoritysep = C4::Context->preference('authoritysep');	1827	my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
1828		1828
1829	foreach my $field ( $record->field($fields_filter) ) {	1829	foreach my $field ( $record->field($fields_filter) ) {
1830	next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);	1830	next unless ($field->tag() >= $mintag && $field->tag() <= $maxtag);
Lines 1870-1876 sub GetMarcSubjects { Link Here
1870	code => $code,	1870	code => $code,
1871	value => $value,	1871	value => $value,
1872	link_loop => \@this_link_loop,	1872	link_loop => \@this_link_loop,
1873	separator => (scalar @subfields_loop) ? $authoritysep : ''	1873	separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
1874	};	1874	};
1875	}	1875	}
1876	}	1876	}
Lines 1915-1921 sub GetMarcAuthors { Link Here
1915	}	1915	}
1916		1916
1917	my @marcauthors;	1917	my @marcauthors;
1918	my $authoritysep = C4::Context->preference('authoritysep');	1918	my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
1919		1919
1920	foreach my $field ( $record->field($fields_filter) ) {	1920	foreach my $field ( $record->field($fields_filter) ) {
1921	next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;	1921	next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 1964-1970 sub GetMarcAuthors { Link Here
1964	code => $code,	1964	code => $code,
1965	value => $value,	1965	value => $value,
1966	link_loop => \@this_link_loop,	1966	link_loop => \@this_link_loop,
1967	separator => (scalar @subfields_loop) ? $authoritysep : ''	1967	separator => (scalar @subfields_loop) ? $AuthoritySeparator : ''
1968	};	1968	};
1969	}	1969	}
1970	}	1970	}
Lines 2063-2069 sub GetMarcSeries { Link Here
2063	}	2063	}
2064		2064
2065	my @marcseries;	2065	my @marcseries;
2066	my $authoritysep = C4::Context->preference('authoritysep');	2066	my $AuthoritySeparator = C4::Context->preference('AuthoritySeparator');
2067		2067
2068	foreach my $field ( $record->field($fields_filter) ) {	2068	foreach my $field ( $record->field($fields_filter) ) {
2069	next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;	2069	next unless $field->tag() >= $mintag && $field->tag() <= $maxtag;
Lines 2099-2105 sub GetMarcSeries { Link Here
2099	code => $code,	2099	code => $code,
2100	value => $value,	2100	value => $value,
2101	link_loop => \@link_loop,	2101	link_loop => \@link_loop,
2102	separator => (scalar @subfields_loop) ? $authoritysep : '',	2102	separator => (scalar @subfields_loop) ? $AuthoritySeparator : '',
2103	volumenum => $volume_number,	2103	volumenum => $volume_number,
2104	}	2104	}
2105	}	2105	}