From 54f19602332c3390a9b78a3d74d723d132efed34 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 22 Mar 2019 08:03:16 +0000 Subject: [PATCH] Bug 17385: (QA follow-up) Do not needlessly scan biblioexport folder Performance: We need to return an empty list if OpacExportOptions does not contain Custom. No need to scan the directory for custom files, if we are not using them at all. Note: The test only pertains to OPAC now, since the pref should not control intranet behavior. We have no intranet counterpart. See further next follow-up. Test plan: Run t/db_dependent/XSLT.t Signed-off-by: Marcel de Rooy Signed-off-by: David Nind --- C4/XSLT.pm | 2 ++ t/db_dependent/XSLT.t | 45 ++++++++++++++----------------------------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index 14a3d186de..d53df4d643 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -412,6 +412,8 @@ sub engine { sub CustomXSLTExportList { my $opac = shift; # opac (1) vs intranet (0) + return [] if $opac && C4::Context->preference('OpacExportOptions') !~ /custom/; + my @tabFiles; my $dir = C4::Context->config( $opac ? 'opachtdocs' : 'intrahtdocs') . diff --git a/t/db_dependent/XSLT.t b/t/db_dependent/XSLT.t index 2d9e9db1b3..06f74327e5 100755 --- a/t/db_dependent/XSLT.t +++ b/t/db_dependent/XSLT.t @@ -1,37 +1,23 @@ -#!/usr/bin/perl - -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - use Modern::Perl; - use Test::More tests => 2; -use Test::Warn; -use t::lib::TestBuilder; -use t::lib::Mocks; -use Koha::ItemTypes; - -BEGIN { - use_ok('C4::XSLT'); -} +use t::lib::Mocks; +use C4::XSLT; +use Koha::Database; -my $schema = Koha::Database->new->schema; -my $builder = t::lib::TestBuilder->new; +our $schema = Koha::Database->new->schema; +# Here we go $schema->storage->txn_begin; +subtest 'CustomXSLTExportList: Check export options' => sub { + plan tests => 2; + 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'); + $list = C4::XSLT::CustomXSLTExportList(1); + is( @$list, 0, 'We expect an empty list now' ); +}; subtest 'buildKohaItemsNamespace status tests' => sub { plan tests => 13; @@ -111,8 +97,5 @@ subtest 'buildKohaItemsNamespace status tests' => sub { }); $xml = C4::XSLT::buildKohaItemsNamespace( $item->biblionumber,[]); like($xml,qr{Pending hold},"Pending status takes precedence over all"); - - }; - $schema->storage->txn_rollback; -- 2.17.1