Attachment #128224 for bug #27981

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

Lines 2670-2675 sub _koha_marc_update_bib_ids { Link Here

(-)a/C4/Biblio.pm (+7 lines)
2670	} else {	2670	} else {
2671	C4::Biblio::UpsertMarcSubfield($record, $biblioitem_tag, $biblioitem_subfield, $biblioitemnumber);	2671	C4::Biblio::UpsertMarcSubfield($record, $biblioitem_tag, $biblioitem_subfield, $biblioitemnumber);
2672	}	2672	}
		2673
		2674	# update the control number (001) in MARC
		2675	if(C4::Context->preference('autoControlNumber') eq 'biblionumber'){
		2676	unless($record->field('001')){
		2677	$record->insert_fields_ordered(MARC::Field->new('001', $biblionumber));
		2678	}
		2679	}
2673	}	2680	}
2674		2681
2675	=head2 _koha_marc_update_biblioitem_cn_sort	2682	=head2 _koha_marc_update_biblioitem_cn_sort

Lines 806-812 if (($biblionumber) && !($breedingid)){ Link Here

(-)a/cataloguing/addbiblio.pl (-1 / +5 lines)
806	if ($breedingid) {	806	if ($breedingid) {
807	( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;	807	( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
808	}	808	}
809		809	if ( $record && $op eq 'duplicate' &&
		810	C4::Context->preference('autoControlNumber') eq 'biblionumber' ){
		811	my @control_num = $record->field('001');
		812	$record->delete_fields(@control_num);
		813	}
810	#populate hostfield if hostbiblionumber is available	814	#populate hostfield if hostbiblionumber is available
811	if ($hostbiblionumber) {	815	if ($hostbiblionumber) {
812	my $marcflavour = C4::Context->preference("marcflavour");	816	my $marcflavour = C4::Context->preference("marcflavour");

Lines 71-76 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
71	('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),	71	('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
72	('AuthSuccessLog','0',NULL,'If enabled, log successful authentications','YesNo'),	72	('AuthSuccessLog','0',NULL,'If enabled, log successful authentications','YesNo'),
73	('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'),	73	('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'),
		74	('autoControlNumber','OFF','biblionumber\|OFF','Used to autogenerate a Control Number: biblionumber will be as biblionumber, OFF will leave the field as it is;','Choice'),
74	('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),	75	('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
75	('AutoCreditNumber', '', '', 'Automatically generate a number for account credits', 'Choice'),	76	('AutoCreditNumber', '', '', 'Automatically generate a number for account credits', 'Choice'),
76	('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),	77	('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),




            return _framework_kohafields[kohafield];
        },

        GetRecord: function( id, remove_control_num, callback ) {
            $.get(
                '/cgi-bin/koha/svc/bib/'+ id
            ).done( function( metadata ) {
                $.get(
                    '/cgi-bin/koha/svc/bib_framework/' + id
                ).done( function( frameworkcode ) {
                    var record = new MARC.Record();
                    record.loadMARCXML(metadata);
                    if( remove_control_num ) { record.removeField("001"); }
                    record.frameworkcode = $(frameworkcode).find('frameworkcode').text();
                    initFramework( record.frameworkcode, function( error ) {
                        if ( typeof error === 'undefined' ) {




            saveLabel: _("Duplicate"),
            get: function( id, callback ) {
                if ( !id ) return false;
                var remove_control_num = [% IF Koha.Preference('autoControlNumber') == 'OFF' %] 0 [% ELSE %] 1 [% END %];

                KohaBackend.GetRecord( id, remove_control_num, callback );
            },
            save: function( id, record, done ) {
                function finishCb( data ) {
                    done( { error: data.error, newRecord: data.marcxml && data.marcxml[0], newId: data.biblionumber && [ 'catalog', data.biblionumber ] } );
                }
                [% IF Koha.Preference('autoControlNumber') != 'OFF' %]
                    record.removeField("001");
                [% END %]

                KohaBackend.CreateRecord( record, finishCb );
            }

            get: function( id, callback ) {
                if ( !id ) return false;

                KohaBackend.GetRecord( id, "", callback );
            },
            save: function( id, record, done ) {
                function finishCb( data ) {

Lines 165-170 Cataloging: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (+6 lines)
165	- and record's last modifier name in MARC subfield	165	- and record's last modifier name in MARC subfield
166	- pref: MarcFieldForModifierName	166	- pref: MarcFieldForModifierName
167	- ". <br/><strong>NOTE:</strong> Use a dollar sign between field and subfield like 123$a."	167	- ". <br/><strong>NOTE:</strong> Use a dollar sign between field and subfield like 123$a."
		168	-
		169	- Control Number (001) is
		170	- pref: autoControlNumber
		171	choices:
		172	biblionumber: generated as biblionumber.
		173	"OFF": not generated automatically.
168	Display:	174	Display:
169	-	175	-
170	- 'Separate main entry and subdivisions with '	176	- 'Separate main entry and subdivisions with '





use Modern::Perl;

use Test::More tests => 15;
use Test::MockModule;
use Test::Warn;
use List::MoreUtils qw( uniq );

    # Authority tests don't interact well with Elasticsearch at the moment due to the fact that there's currently no way to
    # roll back ES index changes.
    t::lib::Mocks::mock_preference('SearchEngine', 'Zebra');
    t::lib::Mocks::mock_preference('autoControlNumber', 'OFF');

    my $isbn = '0590353403';
    my $title = 'Foundation';

    );
};

subtest 'autoControlNumber tests' => sub {
    plan tests => 3;

    t::lib::Mocks::mock_preference('autoControlNumber', 'OFF');

    my $record = MARC::Record->new();
    my ($biblionumber) = C4::Biblio::AddBiblio($record, '');
    $record = GetMarcBiblio({biblionumber => $biblionumber});
    is($record->field('001'), undef, '001 not set when pref is off');

    t::lib::Mocks::mock_preference('autoControlNumber', 'biblionumber');
    C4::Biblio::ModBiblio($record, $biblionumber, "", 1);
    $record = GetMarcBiblio({biblionumber => $biblionumber});
    is($record->field('001')->as_string(), $biblionumber, '001 set to biblionumber when pref set and field is blank');

    $record->field('001')->update('Not biblionumber');
    C4::Biblio::ModBiblio($record, $biblionumber, "", 1);
    $record = GetMarcBiblio({biblionumber => $biblionumber});
    is($record->field('001')->as_string(), 'Not biblionumber', '001 not set to biblionumber when pref set and field exists');

};


# Cleanup
Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
$schema->storage->txn_rollback;
- 

Return to bug 27981

Lines 103-117 define( [ '/cgi-bin/koha/svc/cataloguing/framework?frameworkcode=&callback=defin Link Here

(-)a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/koha-backend.js (-2 / +3 lines)
103	return _framework_kohafields[kohafield];	103	return _framework_kohafields[kohafield];
104	},	104	},
105		105
106	GetRecord: function( id, callback ) {	106	GetRecord: function( id, remove_control_num, callback ) {
107	$.get(	107	$.get(
108	'/cgi-bin/koha/svc/bib/' + id	108	'/cgi-bin/koha/svc/bib/'+ id
109	).done( function( metadata ) {	109	).done( function( metadata ) {
110	$.get(	110	$.get(
111	'/cgi-bin/koha/svc/bib_framework/' + id	111	'/cgi-bin/koha/svc/bib_framework/' + id
112	).done( function( frameworkcode ) {	112	).done( function( frameworkcode ) {
113	var record = new MARC.Record();	113	var record = new MARC.Record();
114	record.loadMARCXML(metadata);	114	record.loadMARCXML(metadata);
		115	if( remove_control_num ) { record.removeField("001"); }
115	record.frameworkcode = $(frameworkcode).find('frameworkcode').text();	116	record.frameworkcode = $(frameworkcode).find('frameworkcode').text();
116	initFramework( record.frameworkcode, function( error ) {	117	initFramework( record.frameworkcode, function( error ) {
117	if ( typeof error === 'undefined' ) {	118	if ( typeof error === 'undefined' ) {

Lines 251-263 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc (-2 / +6 lines)
251	saveLabel: _("Duplicate"),	251	saveLabel: _("Duplicate"),
252	get: function( id, callback ) {	252	get: function( id, callback ) {
253	if ( !id ) return false;	253	if ( !id ) return false;
		254	var remove_control_num = [% IF Koha.Preference('autoControlNumber') == 'OFF' %] 0 [% ELSE %] 1 [% END %];
254		255
255	KohaBackend.GetRecord( id, callback );	256	KohaBackend.GetRecord( id, remove_control_num, callback );
256	},	257	},
257	save: function( id, record, done ) {	258	save: function( id, record, done ) {
258	function finishCb( data ) {	259	function finishCb( data ) {
259	done( { error: data.error, newRecord: data.marcxml && data.marcxml[0], newId: data.biblionumber && [ 'catalog', data.biblionumber ] } );	260	done( { error: data.error, newRecord: data.marcxml && data.marcxml[0], newId: data.biblionumber && [ 'catalog', data.biblionumber ] } );
260	}	261	}
		262	[% IF Koha.Preference('autoControlNumber') != 'OFF' %]
		263	record.removeField("001");
		264	[% END %]
261		265
262	KohaBackend.CreateRecord( record, finishCb );	266	KohaBackend.CreateRecord( record, finishCb );
263	}	267	}
Lines 272-278 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
272	get: function( id, callback ) {	276	get: function( id, callback ) {
273	if ( !id ) return false;	277	if ( !id ) return false;
274		278
275	KohaBackend.GetRecord( id, callback );	279	KohaBackend.GetRecord( id, "", callback );
276	},	280	},
277	save: function( id, record, done ) {	281	save: function( id, record, done ) {
278	function finishCb( data ) {	282	function finishCb( data ) {

Lines 17-23 Link Here

(-)a/t/db_dependent/Biblio.t (-2 / +25 lines)
17		17
18	use Modern::Perl;	18	use Modern::Perl;
19		19
20	use Test::More tests => 14;	20	use Test::More tests => 15;
21	use Test::MockModule;	21	use Test::MockModule;
22	use Test::Warn;	22	use Test::Warn;
23	use List::MoreUtils qw( uniq );	23	use List::MoreUtils qw( uniq );
Lines 250-255 sub run_tests { Link Here
250	# Authority tests don't interact well with Elasticsearch at the moment due to the fact that there's currently no way to	250	# Authority tests don't interact well with Elasticsearch at the moment due to the fact that there's currently no way to
251	# roll back ES index changes.	251	# roll back ES index changes.
252	t::lib::Mocks::mock_preference('SearchEngine', 'Zebra');	252	t::lib::Mocks::mock_preference('SearchEngine', 'Zebra');
		253	t::lib::Mocks::mock_preference('autoControlNumber', 'OFF');
253		254
254	my $isbn = '0590353403';	255	my $isbn = '0590353403';
255	my $title = 'Foundation';	256	my $title = 'Foundation';
Lines 818-823 subtest "LinkBibHeadingsToAuthorities record generation tests" => sub { Link Here
818	);	819	);
819	};	820	};
820		821
		822	subtest 'autoControlNumber tests' => sub {
		823	plan tests => 3;
		824
		825	t::lib::Mocks::mock_preference('autoControlNumber', 'OFF');
		826
		827	my $record = MARC::Record->new();
		828	my ($biblionumber) = C4::Biblio::AddBiblio($record, '');
		829	$record = GetMarcBiblio({biblionumber => $biblionumber});
		830	is($record->field('001'), undef, '001 not set when pref is off');
		831
		832	t::lib::Mocks::mock_preference('autoControlNumber', 'biblionumber');
		833	C4::Biblio::ModBiblio($record, $biblionumber, "", 1);
		834	$record = GetMarcBiblio({biblionumber => $biblionumber});
		835	is($record->field('001')->as_string(), $biblionumber, '001 set to biblionumber when pref set and field is blank');
		836
		837	$record->field('001')->update('Not biblionumber');
		838	C4::Biblio::ModBiblio($record, $biblionumber, "", 1);
		839	$record = GetMarcBiblio({biblionumber => $biblionumber});
		840	is($record->field('001')->as_string(), 'Not biblionumber', '001 not set to biblionumber when pref set and field exists');
		841
		842	};
		843
		844
821	# Cleanup	845	# Cleanup
822	Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );	846	Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
823	$schema->storage->txn_rollback;	847	$schema->storage->txn_rollback;
824	-