Bugzilla – Attachment 100673 Details for
Bug 17385
Add custom export formats for bibliographic records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17385: (QA follow-up) Add caching
Bug-17385-QA-follow-up-Add-caching.patch (text/plain), 3.17 KB, created by
David Nind
on 2020-03-13 09:02:21 UTC
(
hide
)
Description:
Bug 17385: (QA follow-up) Add caching
Filename:
MIME Type:
Creator:
David Nind
Created:
2020-03-13 09:02:21 UTC
Size:
3.17 KB
patch
obsolete
>From ad5203a95a11ed040d329b91265d449777bf6f93 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 22 Mar 2019 08:51:05 +0000 >Subject: [PATCH] Bug 17385: (QA follow-up) Add caching > >Performance: We should add caching in CustomXSLTExportList. > >Note: This resolves the lack of an intranet test in the former patch too. > >Test plan: >Run t/db_dependent/XSLT.t > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: David Nind <david@davidnind.com> >--- > C4/XSLT.pm | 9 ++++++++- > t/db_dependent/XSLT.t | 18 +++++++++++------- > 2 files changed, 19 insertions(+), 8 deletions(-) > >diff --git a/C4/XSLT.pm b/C4/XSLT.pm >index 2672724897..f324433bd2 100644 >--- a/C4/XSLT.pm >+++ b/C4/XSLT.pm >@@ -30,6 +30,7 @@ use C4::Biblio; > use C4::Circulation; > use C4::Reserves; > use Koha::AuthorisedValues; >+use Koha::Caches; > use Koha::ItemTypes; > use Koha::XSLT_Handler; > use Koha::Libraries; >@@ -414,8 +415,13 @@ sub CustomXSLTExportList { > my $opac = shift; # opac (1) vs intranet (0) > return [] if $opac && C4::Context->preference('OpacExportOptions') !~ /custom/; > >- my @tabFiles; >+ # Check the cache first >+ my $cache = Koha::Caches->get_instance; >+ my $key = $opac ? 'CustomXSLTExportListOPAC' : 'CustomXSLTExportListIntra'; >+ my $cached_val = $cache->get_from_cache($key); >+ return $cached_val if $cached_val; > >+ my @tabFiles; > my $dir = C4::Context->config( $opac ? 'opachtdocs' : 'intrahtdocs') . > '/' . C4::Context->preference( $opac ? "opacthemes" : "template") . > '/' . C4::Languages::getlanguage() . >@@ -449,6 +455,7 @@ sub CustomXSLTExportList { > push @tabFiles, \%row; > } > } >+ $cache->set_in_cache( $key, [ @tabFiles ] ); > return \@tabFiles; > } > >diff --git a/t/db_dependent/XSLT.t b/t/db_dependent/XSLT.t >index a686ae7b2d..d933cf80a4 100644 >--- a/t/db_dependent/XSLT.t >+++ b/t/db_dependent/XSLT.t >@@ -3,22 +3,26 @@ use Test::More tests => 2; > > use t::lib::Mocks; > use C4::XSLT; >+use Koha::Caches; > use Koha::Database; > > our $schema = Koha::Database->new->schema; >+our $cache = Koha::Caches->get_instance; > > # Here we go > $schema->storage->txn_begin; >-subtest 'CustomXSLTExportList: Check export options' => sub { >- plan tests => 2; >+subtest 'CustomXSLTExportList: Caching' => sub { >+ plan tests => 1; > t::lib::Mocks::mock_preference('OpacExportOptions', 'custom'); >- my $list = C4::XSLT::CustomXSLTExportList(1); >- is( @$list>0, 1, 'We expect at least one result: simple export' ); >- t::lib::Mocks::mock_preference('OpacExportOptions', 'dc'); >+ $cache->clear_from_cache('CustomXSLTExportListOPAC'); >+ my $list = C4::XSLT::CustomXSLTExportList(1); >+ push @$list, { nonsense => 1 }; >+ $cache->set_in_cache( 'CustomXSLTExportListOPAC', $list ); >+ my $n = @$list; > $list = C4::XSLT::CustomXSLTExportList(1); >- is( @$list, 0, 'We expect an empty list now' ); >+ is( @$list, $n, 'This list comes from the cache and that is fine' ); >+ $cache->clear_from_cache('CustomXSLTExportListOPAC'); > }; >- > subtest 'buildKohaItemsNamespace status tests' => sub { > plan tests => 13; > my $item = $builder->build_sample_item({}); >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17385
:
55961
|
58308
|
64033
|
64034
|
67357
|
67579
|
74660
|
74661
|
79055
|
79056
|
80675
|
81385
|
81386
|
84388
|
84389
|
84390
|
86875
|
86876
|
86877
|
86878
|
86879
|
86880
|
97076
|
97101
|
97102
|
97103
|
97104
|
97105
|
100289
|
100290
|
100291
|
100292
|
100293
|
100663
|
100670
|
100671
|
100672
|
100673
|
100674
|
100675
|
112671
|
112672
|
112673
|
112674
|
112675
|
112676
|
112677
|
112678
|
112679
|
112680
|
112681
|
112682
|
112956
|
112957
|
112958
|
112959
|
130283
|
130284
|
130285
|
130286
|
130287
|
130691
|
130692
|
130693
|
130694
|
130695
|
131492
|
132488
|
132489
|
132490
|
132491
|
132492
|
132493
|
132581
|
133498
|
133499
|
133500
|
133501
|
133502
|
133503
|
133504
|
138031
|
138032
|
138033
|
138034
|
138035
|
138036
|
138037
|
138082
|
138083
|
138084
|
138085
|
138086
|
138087
|
138088
|
138132
|
139277
|
139278
|
139279
|
139280
|
139281
|
139282
|
139283
|
139284
|
141157
|
141158
|
141159
|
141160
|
141161
|
141162
|
141163
|
141164
|
144335
|
144336
|
144380
|
144384
|
151095
|
151096
|
151097
|
151098
|
151099
|
151102
|
151103
|
151104
|
151105
|
151106
|
151377
|
151378
|
151379
|
151380
|
151381
|
154379
|
154380
|
154381
|
154382
|
154383
|
156815
|
156816
|
156817
|
156818
|
156819
|
159142
|
159143
|
159144
|
159145
|
159146
|
159147
|
159148
|
163623
|
170014
|
170015
|
170016
|
170017
|
170018
|
170019
|
170026
|
170027
|
170028
|
170029
|
170030
|
170031
|
170983
|
170984
|
170985
|
170986
|
170987
|
170988