Attachment #142602 for bug #31196

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

Lines 78-84 if ( $op eq 'add_form' ) { Link Here

(-)a/admin/biblio_framework.pl (-2 lines)
78	}	78	}
79	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	79	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
80	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	80	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
81	$cache->clear_from_cache("default_value_for_mod_marc-");
82	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	81	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
83	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	82	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
84	$op = 'list';	83	$op = 'list';
Lines 110-116 if ( $op eq 'add_form' ) { Link Here
110	}	109	}
111	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	110	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
112	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	111	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
113	$cache->clear_from_cache("default_value_for_mod_marc-");
114	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	112	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
115	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	113	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
116	$op = 'list';	114	$op = 'list';

Lines 66-74 if( $input->param('add_field') && $input->request_method eq 'POST' ) { Link Here

(-)a/admin/koha2marclinks.pl (-3 / +1 lines)
66		66
67	# Clear the cache when needed	67	# Clear the cache when needed
68	unless( $no_upd ) {	68	unless( $no_upd ) {
69	for( qw\| default_value_for_mod_marc- MarcSubfieldStructure- \| ) {	69	$cache->clear_from_cache("MarcSubfieldStructure-");
70	$cache->clear_from_cache($_);
71	}
72	}	70	}
73		71
74	# Build/Show the form	72	# Build/Show the form

Lines 297-303 elsif ( $op eq 'add_validate' ) { Link Here

(-)a/admin/marc_subfields_structure.pl (-2 lines)
297	}	297	}
298	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	298	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
299	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	299	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
300	$cache->clear_from_cache("default_value_for_mod_marc-");
301	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	300	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
302	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	301	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
303		302
Lines 336-342 elsif ( $op eq 'delete_confirmed' ) { Link Here
336		335
337	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	336	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
338	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	337	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
339	$cache->clear_from_cache("default_value_for_mod_marc-");
340	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	338	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
341	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	339	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
342	print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode");	340	print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode");

Lines 15156-15162 if( CheckVersion( $DBversion ) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-1 lines)
15156	for my $frameworkcode (@frameworkcodes) {	15156	for my $frameworkcode (@frameworkcodes) {
15157	Koha::Caches->get_instance->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	15157	Koha::Caches->get_instance->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
15158	}	15158	}
15159	Koha::Caches->get_instance->clear_from_cache("default_value_for_mod_marc-");
15160	}	15159	}
15161		15160
15162	SetVersion( $DBversion );	15161	SetVersion( $DBversion );

Lines 364-370 subtest 'SearchItems test' => sub { Link Here

(-)a/t/db_dependent/Items.t (-2 lines)
364	my $cache = Koha::Caches->get_instance();	364	my $cache = Koha::Caches->get_instance();
365	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	365	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
366	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	366	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
367	$cache->clear_from_cache("default_value_for_mod_marc-");
368	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	367	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
369		368
370	my $item3_record = MARC::Record->new;	369	my $item3_record = MARC::Record->new;
Lines 395-401 subtest 'SearchItems test' => sub { Link Here
395	# Clear cache	394	# Clear cache
396	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	395	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
397	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	396	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
398	$cache->clear_from_cache("default_value_for_mod_marc-");
399	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	397	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
400		398
401	ModItemFromMarc($item3_record, $biblio->biblionumber, $item3_itemnumber);	399	ModItemFromMarc($item3_record, $biblio->biblionumber, $item3_itemnumber);

Lines 42-48 $dbh->do(qq\| Link Here

(-)a/t/db_dependent/Items/AutomaticItemModificationByAge.t (-2 lines)
42	my $cache = Koha::Caches->get_instance();	42	my $cache = Koha::Caches->get_instance();
43	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	43	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
44	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	44	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
45	$cache->clear_from_cache("default_value_for_mod_marc-");
46	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	45	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
47		46
48	my $record = MARC::Record->new();	47	my $record = MARC::Record->new();
Lines 341-346 is( $schema->resultset('ActionLog')->count(), $actions_nb, q\|ToggleNewStatus: no Link Here
341	$cache = Koha::Caches->get_instance();	340	$cache = Koha::Caches->get_instance();
342	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	341	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
343	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	342	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
344	$cache->clear_from_cache("default_value_for_mod_marc-");
345	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	343	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
346	$schema->storage->txn_rollback;	344	$schema->storage->txn_rollback;

Lines 715-721 subtest 'get_marc_notes() MARC21 tests' => sub { Link Here

(-)a/t/db_dependent/Koha/Biblio.t (-2 lines)
715	my $cache = Koha::Caches->get_instance;	715	my $cache = Koha::Caches->get_instance;
716	$cache->clear_from_cache("MarcStructure-0-");	716	$cache->clear_from_cache("MarcStructure-0-");
717	$cache->clear_from_cache("MarcStructure-1-");	717	$cache->clear_from_cache("MarcStructure-1-");
718	$cache->clear_from_cache("default_value_for_mod_marc-");
719	$cache->clear_from_cache("MarcSubfieldStructure-");	718	$cache->clear_from_cache("MarcSubfieldStructure-");
720		719
721	C4::Biblio::ModBiblio( $record, $biblio->biblionumber );	720	C4::Biblio::ModBiblio( $record, $biblio->biblionumber );
Lines 740-746 subtest 'get_marc_notes() MARC21 tests' => sub { Link Here
740		739
741	$cache->clear_from_cache("MarcStructure-0-");	740	$cache->clear_from_cache("MarcStructure-0-");
742	$cache->clear_from_cache("MarcStructure-1-");	741	$cache->clear_from_cache("MarcStructure-1-");
743	$cache->clear_from_cache("default_value_for_mod_marc-");
744	$cache->clear_from_cache("MarcSubfieldStructure-");	742	$cache->clear_from_cache("MarcSubfieldStructure-");
745		743
746	$schema->storage->txn_rollback;	744	$schema->storage->txn_rollback;

Lines 1291-1297 subtest 'columns_to_str' => sub { Link Here

(-)a/t/db_dependent/Koha/Item.t (-2 lines)
1291	my $cache = Koha::Caches->get_instance();	1291	my $cache = Koha::Caches->get_instance();
1292	$cache->clear_from_cache("MarcStructure-0-");	1292	$cache->clear_from_cache("MarcStructure-0-");
1293	$cache->clear_from_cache("MarcStructure-1-");	1293	$cache->clear_from_cache("MarcStructure-1-");
1294	$cache->clear_from_cache("default_value_for_mod_marc-");
1295	$cache->clear_from_cache("MarcSubfieldStructure-");	1294	$cache->clear_from_cache("MarcSubfieldStructure-");
1296		1295
1297	# Creating subfields 'é', 'è' that are not linked with a kohafield	1296	# Creating subfields 'é', 'è' that are not linked with a kohafield
Lines 1370-1376 subtest 'columns_to_str' => sub { Link Here
1370		1369
1371	$cache->clear_from_cache("MarcStructure-0-");	1370	$cache->clear_from_cache("MarcStructure-0-");
1372	$cache->clear_from_cache("MarcStructure-1-");	1371	$cache->clear_from_cache("MarcStructure-1-");
1373	$cache->clear_from_cache("default_value_for_mod_marc-");
1374	$cache->clear_from_cache("MarcSubfieldStructure-");	1372	$cache->clear_from_cache("MarcSubfieldStructure-");
1375		1373
1376	$schema->storage->txn_rollback;	1374	$schema->storage->txn_rollback;

Lines 38-44 my $item = $builder->build_sample_item({ biblionumber => $biblio->biblionumber } Link Here

(-)a/t/db_dependent/Koha/Item/Attributes.t (-1 lines)
38	my $cache = Koha::Caches->get_instance;	38	my $cache = Koha::Caches->get_instance;
39	$cache->clear_from_cache("MarcStructure-0-");	39	$cache->clear_from_cache("MarcStructure-0-");
40	$cache->clear_from_cache("MarcStructure-1-");	40	$cache->clear_from_cache("MarcStructure-1-");
41	$cache->clear_from_cache("default_value_for_mod_marc-");
42	$cache->clear_from_cache("MarcSubfieldStructure-");	41	$cache->clear_from_cache("MarcSubfieldStructure-");
43		42
44	# 952 $x $é $y are not linked with a kohafield	43	# 952 $x $é $y are not linked with a kohafield

Lines 36-42 my $builder = t::lib::TestBuilder->new; Link Here

(-)a/t/db_dependent/Koha/UI/Form/Builder/Item.t (-2 lines)
36	my $cache = Koha::Caches->get_instance();	36	my $cache = Koha::Caches->get_instance();
37	$cache->clear_from_cache("MarcStructure-0-");	37	$cache->clear_from_cache("MarcStructure-0-");
38	$cache->clear_from_cache("MarcStructure-1-");	38	$cache->clear_from_cache("MarcStructure-1-");
39	$cache->clear_from_cache("default_value_for_mod_marc-");
40	$cache->clear_from_cache("MarcSubfieldStructure-");	39	$cache->clear_from_cache("MarcSubfieldStructure-");
41		40
42	# 952 $x $é are not linked with a kohafield	41	# 952 $x $é are not linked with a kohafield
Lines 350-356 subtest 'Fix subfill_with_default_values - no biblionumber passed' => sub { Link Here
350		349
351	$cache->clear_from_cache("MarcStructure-0-");	350	$cache->clear_from_cache("MarcStructure-0-");
352	$cache->clear_from_cache("MarcStructure-1-");	351	$cache->clear_from_cache("MarcStructure-1-");
353	$cache->clear_from_cache("default_value_for_mod_marc-");
354	$cache->clear_from_cache("MarcSubfieldStructure-");	352	$cache->clear_from_cache("MarcSubfieldStructure-");
355		353
356	sub setup_mss {	354	sub setup_mss {

Lines 67-73 $dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestricti Link Here

(-)a/t/db_dependent/Reserves.t (-3 lines)
67	my $cache = Koha::Caches->get_instance;	67	my $cache = Koha::Caches->get_instance;
68	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	68	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
69	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	69	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
70	$cache->clear_from_cache("default_value_for_mod_marc-");
71	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	70	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
72		71
73	## Setup Test	72	## Setup Test
Lines 786-792 $dbh->do('DELETE FROM reserves', undef, ($bibnum)); Link Here
786		785
787	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	786	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
788	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	787	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
789	$cache->clear_from_cache("default_value_for_mod_marc-");
790	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	788	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
791		789
792	subtest '_koha_notify_reserve() tests' => sub {	790	subtest '_koha_notify_reserve() tests' => sub {
793	-

Return to bug 31196

Lines 153-159 if ($op eq 'add_form') { Link Here

(-)a/admin/marctagstructure.pl (-2 lines)
153	}	153	}
154	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	154	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
155	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	155	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
156	$cache->clear_from_cache("default_value_for_mod_marc-");
157	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	156	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
158	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	157	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
159	print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode");	158	print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode");
Lines 179-185 if ($op eq 'add_form') { Link Here
179	$sth2->execute($searchfield, $frameworkcode);	178	$sth2->execute($searchfield, $frameworkcode);
180	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	179	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
181	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	180	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
182	$cache->clear_from_cache("default_value_for_mod_marc-");
183	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	181	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
184	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	182	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
185	$template->param( searchfield => $searchfield );	183	$template->param( searchfield => $searchfield );