Attachment #137895 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-75 if( $input->param('add_field') && $input->request_method eq 'POST' ) { Link Here

(-)a/admin/koha2marclinks.pl (-4 / +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	warn "clear $_";
71	$cache->clear_from_cache($_);
72	}
73	}	70	}
74		71
75	# Build/Show the form	72	# Build/Show the form

Lines 307-313 elsif ( $op eq 'add_validate' ) { Link Here

(-)a/admin/marc_subfields_structure.pl (-2 lines)
307	}	307	}
308	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	308	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
309	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	309	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
310	$cache->clear_from_cache("default_value_for_mod_marc-");
311	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	310	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
312	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	311	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
313		312
Lines 346-352 elsif ( $op eq 'delete_confirmed' ) { Link Here
346		345
347	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	346	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
348	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	347	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
349	$cache->clear_from_cache("default_value_for_mod_marc-");
350	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	348	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
351	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");	349	$cache->clear_from_cache("MarcCodedFields-$frameworkcode");
352	print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode");	350	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 442-448 subtest 'SearchItems test' => sub { Link Here

(-)a/t/db_dependent/Items.t (-2 lines)
442	my $cache = Koha::Caches->get_instance();	442	my $cache = Koha::Caches->get_instance();
443	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	443	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
444	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	444	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
445	$cache->clear_from_cache("default_value_for_mod_marc-");
446	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	445	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
447		446
448	my $item3_record = MARC::Record->new;	447	my $item3_record = MARC::Record->new;
Lines 473-479 subtest 'SearchItems test' => sub { Link Here
473	# Clear cache	472	# Clear cache
474	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	473	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
475	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	474	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
476	$cache->clear_from_cache("default_value_for_mod_marc-");
477	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	475	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
478		476
479	ModItemFromMarc($item3_record, $biblio->biblionumber, $item3_itemnumber);	477	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 1276-1282 subtest 'columns_to_str' => sub { Link Here

(-)a/t/db_dependent/Koha/Item.t (-2 lines)
1276	my $cache = Koha::Caches->get_instance();	1276	my $cache = Koha::Caches->get_instance();
1277	$cache->clear_from_cache("MarcStructure-0-");	1277	$cache->clear_from_cache("MarcStructure-0-");
1278	$cache->clear_from_cache("MarcStructure-1-");	1278	$cache->clear_from_cache("MarcStructure-1-");
1279	$cache->clear_from_cache("default_value_for_mod_marc-");
1280	$cache->clear_from_cache("MarcSubfieldStructure-");	1279	$cache->clear_from_cache("MarcSubfieldStructure-");
1281		1280
1282	# Creating subfields 'é', 'è' that are not linked with a kohafield	1281	# Creating subfields 'é', 'è' that are not linked with a kohafield
Lines 1355-1361 subtest 'columns_to_str' => sub { Link Here
1355		1354
1356	$cache->clear_from_cache("MarcStructure-0-");	1355	$cache->clear_from_cache("MarcStructure-0-");
1357	$cache->clear_from_cache("MarcStructure-1-");	1356	$cache->clear_from_cache("MarcStructure-1-");
1358	$cache->clear_from_cache("default_value_for_mod_marc-");
1359	$cache->clear_from_cache("MarcSubfieldStructure-");	1357	$cache->clear_from_cache("MarcSubfieldStructure-");
1360		1358
1361	$schema->storage->txn_rollback;	1359	$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 35-41 my $builder = t::lib::TestBuilder->new; Link Here

(-)a/t/db_dependent/Koha/UI/Form/Builder/Item.t (-2 lines)
35	my $cache = Koha::Caches->get_instance();	35	my $cache = Koha::Caches->get_instance();
36	$cache->clear_from_cache("MarcStructure-0-");	36	$cache->clear_from_cache("MarcStructure-0-");
37	$cache->clear_from_cache("MarcStructure-1-");	37	$cache->clear_from_cache("MarcStructure-1-");
38	$cache->clear_from_cache("default_value_for_mod_marc-");
39	$cache->clear_from_cache("MarcSubfieldStructure-");	38	$cache->clear_from_cache("MarcSubfieldStructure-");
40		39
41	# 952 $x $é are not linked with a kohafield	40	# 952 $x $é are not linked with a kohafield
Lines 301-307 subtest 'subfields_to_allow & ignore_not_allowed_subfields' => sub { Link Here
301		300
302	$cache->clear_from_cache("MarcStructure-0-");	301	$cache->clear_from_cache("MarcStructure-0-");
303	$cache->clear_from_cache("MarcStructure-1-");	302	$cache->clear_from_cache("MarcStructure-1-");
304	$cache->clear_from_cache("default_value_for_mod_marc-");
305	$cache->clear_from_cache("MarcSubfieldStructure-");	303	$cache->clear_from_cache("MarcSubfieldStructure-");
306		304
307	sub setup_mss {	305	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 790-796 $dbh->do('DELETE FROM reserves', undef, ($bibnum)); Link Here
790		789
791	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");	790	$cache->clear_from_cache("MarcStructure-0-$frameworkcode");
792	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");	791	$cache->clear_from_cache("MarcStructure-1-$frameworkcode");
793	$cache->clear_from_cache("default_value_for_mod_marc-");
794	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");	792	$cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
795		793
796	subtest '_koha_notify_reserve() tests' => sub {	794	subtest '_koha_notify_reserve() tests' => sub {
797	-

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 );