projects / koha-ffzg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 13ec1f0)
Bug 31196: Remove 'default_value_for_mod_marc-' clear_from_cache calls
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Wed, 20 Jul 2022 07:38:57 +0000 (09:38 +0200)
committerLucas Gass <lucas@bywatersolutions.com>
Mon, 5 Dec 2022 23:19:21 +0000 (23:19 +0000)
We are seeing the following lines several times in the codebase
  $cache->clear_from_cache("default_value_for_mod_marc-");

But values are never set for this key.

Test plan:
Ask you, "Is the above correct?"
Use the correct 'git grep' and 'git log' and confirm the assertion.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 93d44d18759d43a09f6c623ffe4fa81dca4dcaa2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
12 files changed:
admin/biblio_framework.pl patch | blob | history
admin/koha2marclinks.pl patch | blob | history
admin/marc_subfields_structure.pl patch | blob | history
admin/marctagstructure.pl patch | blob | history
installer/data/mysql/updatedatabase.pl patch | blob | history
t/db_dependent/Items.t patch | blob | history
t/db_dependent/Items/AutomaticItemModificationByAge.t patch | blob | history
t/db_dependent/Koha/Biblio.t patch | blob | history
t/db_dependent/Koha/Item.t patch | blob | history
t/db_dependent/Koha/Item/Attributes.t patch | blob | history
t/db_dependent/Koha/UI/Form/Builder/Item.t patch | blob | history
t/db_dependent/Reserves.t patch | blob | history

diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl
index 4712f0e..d8988e0 100755 (executable)
--- a/admin/biblio_framework.pl
+++ b/admin/biblio_framework.pl
@@ -78,7 +78,6 @@ if ( $op eq 'add_form' ) {
     }
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
     $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
     $op = 'list';
@@ -110,7 +109,6 @@ if ( $op eq 'add_form' ) {
     }
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
     $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
     $op = 'list';
diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index b60e4fd..769422b 100755 (executable)
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -66,9 +66,7 @@ if( $input->param('add_field') && $input->request_method eq 'POST' ) {
 
 # Clear the cache when needed
 unless( $no_upd ) {
-    for( qw| default_value_for_mod_marc- MarcSubfieldStructure- | ) {
-        $cache->clear_from_cache($_);
-    }
+    $cache->clear_from_cache("MarcSubfieldStructure-");
 }
 
 # Build/Show the form
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 79232ae..2d10c41 100755 (executable)
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -297,7 +297,6 @@ elsif ( $op eq 'add_validate' ) {
     }
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
     $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
 
@@ -336,7 +335,6 @@ elsif ( $op eq 'delete_confirmed' ) {
 
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
     $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
     print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&amp;frameworkcode=$frameworkcode");
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 3514bac..fbb955d 100755 (executable)
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -153,7 +153,6 @@ if ($op eq 'add_form') {
     }
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
     $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
     print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode");
@@ -179,7 +178,6 @@ if ($op eq 'add_form') {
     $sth2->execute($searchfield, $frameworkcode);
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
     $cache->clear_from_cache("MarcCodedFields-$frameworkcode");
     $template->param( searchfield => $searchfield );
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 7d20478..c95fdf3 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -15156,7 +15156,6 @@ if( CheckVersion( $DBversion ) ) {
         for my $frameworkcode (@frameworkcodes) {
             Koha::Caches->get_instance->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
         }
-        Koha::Caches->get_instance->clear_from_cache("default_value_for_mod_marc-");
     }
 
     SetVersion( $DBversion );
diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t
index 3b5c622..93764c7 100755 (executable)
--- a/t/db_dependent/Items.t
+++ b/t/db_dependent/Items.t
@@ -541,7 +541,6 @@ subtest 'SearchItems test' => sub {
     my $cache = Koha::Caches->get_instance();
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
 
     my $item3_record = MARC::Record->new;
@@ -572,7 +571,6 @@ subtest 'SearchItems test' => sub {
     # Clear cache
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
 
     ModItemFromMarc($item3_record, $biblio->biblionumber, $item3_itemnumber);
diff --git a/t/db_dependent/Items/AutomaticItemModificationByAge.t b/t/db_dependent/Items/AutomaticItemModificationByAge.t
index 61e6100..60507a4 100755 (executable)
--- a/t/db_dependent/Items/AutomaticItemModificationByAge.t
+++ b/t/db_dependent/Items/AutomaticItemModificationByAge.t
@@ -42,7 +42,6 @@ $dbh->do(qq|
 my $cache = Koha::Caches->get_instance();
 $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
 $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-$cache->clear_from_cache("default_value_for_mod_marc-");
 $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
 
 my $record = MARC::Record->new();
@@ -341,6 +340,5 @@ is( $schema->resultset('ActionLog')->count(), $actions_nb, q|ToggleNewStatus: no
 $cache = Koha::Caches->get_instance();
 $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
 $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-$cache->clear_from_cache("default_value_for_mod_marc-");
 $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
 $schema->storage->txn_rollback;
diff --git a/t/db_dependent/Koha/Biblio.t b/t/db_dependent/Koha/Biblio.t
index 14fab65..0a97a8c 100755 (executable)
--- a/t/db_dependent/Koha/Biblio.t
+++ b/t/db_dependent/Koha/Biblio.t
@@ -715,7 +715,6 @@ subtest 'get_marc_notes() MARC21 tests' => sub {
     my $cache = Koha::Caches->get_instance;
     $cache->clear_from_cache("MarcStructure-0-");
     $cache->clear_from_cache("MarcStructure-1-");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-");
 
     C4::Biblio::ModBiblio( $record, $biblio->biblionumber );
@@ -740,7 +739,6 @@ subtest 'get_marc_notes() MARC21 tests' => sub {
 
     $cache->clear_from_cache("MarcStructure-0-");
     $cache->clear_from_cache("MarcStructure-1-");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-");
 
     $schema->storage->txn_rollback;
diff --git a/t/db_dependent/Koha/Item.t b/t/db_dependent/Koha/Item.t
index f90a295..c64e83b 100755 (executable)
--- a/t/db_dependent/Koha/Item.t
+++ b/t/db_dependent/Koha/Item.t
@@ -1092,7 +1092,6 @@ subtest 'columns_to_str' => sub {
     my $cache = Koha::Caches->get_instance();
     $cache->clear_from_cache("MarcStructure-0-");
     $cache->clear_from_cache("MarcStructure-1-");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-");
 
     # Creating subfields 'é', 'è' that are not linked with a kohafield
@@ -1171,7 +1170,6 @@ subtest 'columns_to_str' => sub {
 
     $cache->clear_from_cache("MarcStructure-0-");
     $cache->clear_from_cache("MarcStructure-1-");
-    $cache->clear_from_cache("default_value_for_mod_marc-");
     $cache->clear_from_cache("MarcSubfieldStructure-");
 
     $schema->storage->txn_rollback;
diff --git a/t/db_dependent/Koha/Item/Attributes.t b/t/db_dependent/Koha/Item/Attributes.t
index 8a46b31..3f7d8ab 100755 (executable)
--- a/t/db_dependent/Koha/Item/Attributes.t
+++ b/t/db_dependent/Koha/Item/Attributes.t
@@ -38,7 +38,6 @@ my $item = $builder->build_sample_item({ biblionumber => $biblio->biblionumber }
 my $cache = Koha::Caches->get_instance;
 $cache->clear_from_cache("MarcStructure-0-");
 $cache->clear_from_cache("MarcStructure-1-");
-$cache->clear_from_cache("default_value_for_mod_marc-");
 $cache->clear_from_cache("MarcSubfieldStructure-");
 
 # 952 $x $é $y are not linked with a kohafield
diff --git a/t/db_dependent/Koha/UI/Form/Builder/Item.t b/t/db_dependent/Koha/UI/Form/Builder/Item.t
index 3be0647..caa538b 100755 (executable)
--- a/t/db_dependent/Koha/UI/Form/Builder/Item.t
+++ b/t/db_dependent/Koha/UI/Form/Builder/Item.t
@@ -36,7 +36,6 @@ my $builder = t::lib::TestBuilder->new;
 my $cache = Koha::Caches->get_instance();
 $cache->clear_from_cache("MarcStructure-0-");
 $cache->clear_from_cache("MarcStructure-1-");
-$cache->clear_from_cache("default_value_for_mod_marc-");
 $cache->clear_from_cache("MarcSubfieldStructure-");
 
 # 952 $x $é are not linked with a kohafield
@@ -350,7 +349,6 @@ subtest 'Fix subfill_with_default_values - no biblionumber passed' => sub {
 
 $cache->clear_from_cache("MarcStructure-0-");
 $cache->clear_from_cache("MarcStructure-1-");
-$cache->clear_from_cache("default_value_for_mod_marc-");
 $cache->clear_from_cache("MarcSubfieldStructure-");
 
 sub setup_mss {
diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t
index e309ecf..9e40216 100755 (executable)
--- a/t/db_dependent/Reserves.t
+++ b/t/db_dependent/Reserves.t
@@ -66,7 +66,6 @@ $dbh->do("update marc_subfield_structure set kohafield='biblioitems.agerestricti
 my $cache = Koha::Caches->get_instance;
 $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
 $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-$cache->clear_from_cache("default_value_for_mod_marc-");
 $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
 
 ## Setup Test
@@ -788,7 +787,6 @@ $dbh->do('DELETE FROM reserves', undef, ($bibnum));
 
 $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
 $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-$cache->clear_from_cache("default_value_for_mod_marc-");
 $cache->clear_from_cache("MarcSubfieldStructure-$frameworkcode");
 
 subtest '_koha_notify_reserve() tests' => sub {
KOHA@FFZG based on git://git.koha.org/pub/scm/koha.git