Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm that all SQLHelper tests pass.
(cherry picked from commit dbe36a2bf3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 46a5154df9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 870a4204fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 76be6208ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit b35218a1a4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 181f3b36ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 6f251690ff)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 6a06860f0c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 07af219057)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8aacb28fc0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 316dc62867)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(cherry picked from commit 227cafe8c2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e0612c01d9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit a0c1414f6d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit ed9eac7dd0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 597fabf4f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit bb06b9ac1b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 66fecdd798)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 91aab0fddf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1e2e7b9dd8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a36582632d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 0618b9db72)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 88aee70187)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit e81cbd7fe0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit cbccfdbb61)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 200b5a8231)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 2d113b9303)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1a20feb4ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit dbf3a3df34)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 5579abe41f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 675315473a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 3b9722c7dd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 60bf1f0594)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit f918c57e89)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 329e39b8cc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
use encoding(UTF-8) rather than utf-8 for stricter
encoding
Marking output as ':utf8' only flags the data as utf8
using :encoding(UTF-8) also checks it as valid utf-8
see binmode in perlfunc for more details
In accordance with the robustness principle input
filehandles have not been changed as code may make
the undocumented assumption that invalid utf-8 is present
in the imput
Fixes errors reported by t/00-testcritic.t
Where feasable some filehandles have been made lexical rather than
reusing global filehandle vars
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 263dded818)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 960da426a8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
perl t/Reports.t b/t/Reports.t
All tests complete successfully.
(cherry picked from commit e96c92d077)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e44ed03423)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f053ca0c22)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e4d759ff52)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 995485e574)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9bcc15b3f1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6eac5284ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 14720f508d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 55d0b65522)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 7d4cc170ed)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e6bbb97942)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit bd05f46d12)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch changes the French string (with French stopwords) to an English string with English stopwords, as only English stopwords are installed in the default data.
This patch will allow Search.t to run on the database attached to this bug.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3c12d5f2f6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 0668963124)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended the original patch of Chris to add two exceptions for a line in SetVersion and TransferToNum.
http://bugs.koha-community.org/show_bug.cgi?id=6700
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb92ac1ee0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 28c00dd146)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
To test:
Create 4 holds on a bib, for patrons A, B, C, and D,
Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.
We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D
All worked as expected.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6e07fd7b00)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit da99978777)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3ae23cd6cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4e64d14700)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
To test:
Create a fresh koha db with all of the sample data (if you have one that has the sample branches in it, that will work too)
run the test: prove t/db_dependent/Members.t
All subtests should complete.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests complete successfully with my database created from
sample data and with the database provided on the bug.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b955692c84)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 3a42ff5d67)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This reverts commit 06c822c37c.
(cherry picked from commit 8df873c1a2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 2f95419c36)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 06c822c37c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit caf02e8dca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 64a9c64100)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 31efcea6ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit dfa4b73737)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit c8f04b8e7b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 47b514cf56)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit fc2a6415a9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb79d37b87)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit b418a16623)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7876d4fa8d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 3aa19f2186)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Updating the test
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9c66c42764)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a340ded2ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Removed SearchMembers() and replaced with more generic Search()
Amended Search() to try cardnumber first
Replaced SearchMembers() calls with Search()
Replaced SELECT with Search() where appropriate
C4::SQLHelper:
- added support for '' key for search filter.
- when passing an array to filter, join with OR (rather than AND)
- added support for key => [val1, val2] in filter
- did not document - there was no input documentation to start with,
and SQLHelper should be replaced with something better anyway
Signed-off-by: Liz Rea <lrea@nekls.org>
(again - testing merge issue)
The functionality of the patch seems to be maintained with Biblibre's changes.
I tested the following:
Extended attribute searching: works
3 part name searching: works
2 part name searching: works
1 part name searching: works
From:
mainpage.pl
members-home.pl
Patron search limited by branch: Works
Patron search limited by patron category: works
Ordering by cardnumber instead of surname: works
The "Check Out" field in the masthead.
Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18b8991cf1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
use C4::Koha was loaded only to call C4::Koha::get_infos_of in get_branchinfos_of
the sub get_branchinfos_of was used nowhere
(checked with "grep -R get_branchinfos_of *")
only one reference was made to get_branchinfos_of, in reserve/request.pl, but the sub was not used in fact (maybe removed previously & silently)
This patch removes sub get_branchinfos_of and use C4::Koha in C4::Branch, as well as the reference in request.pl and the t test
The patch doesn't remove use C4::Branch in reserve/request.pl, as it's still used for other subroutines.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 69732f5c62)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Add some test cases and fix a bug in C4::Log found by in review.
Thanks-to: Katrin Fischer.
Signed-off-by: Liz Rea <lrea@nekls.org>
Passes test, interface works as expected.
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a746e11c14)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Ian <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1bb9e5137)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
patch add admin & acqui scripts to test case and fix various errors related to
Perl::Critic compliancy.
- Fixing a style error to pass Perl::Critic, plus silencing a warn
- More style errors, plus fixing a security issue
- Explicitly using Carp
Contrary to common belief, subroutine prototypes do not enable
compile-time checks for proper arguments. Don't use them.
Defining a named sub within another sub, does not prevent that
subroutine being global
Signed-off-by: Frédéric Demians <frederic@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7cdea5de35)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The sample bib label layouts and the hard-coded default
format_string for new layouts used 'callnumber' when they
should have used 'itemcallnumber', preventing call numbers
from being printed on spine labels that use the system-supplied
layouts. Besides correcting the sample data, this patch
now also enshrines 'callnumber' as an alias for 'itemcallnumber'.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After applying patch it works for new and old layouts (itemcallnumber and callnumber).
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d2f49e1976)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit d949472324)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Remove some unnecessary checks when check of error is
sufficient. Make the order in some cases more logical
Should remove some possibilities of runtime warning noise.
Although some calls belong to the 'Nothing could
ever go wrong' school have added some warnings
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack
Paul Poulain
Julian Maurice
Robin Sheat
Sam Sanders
Connor Dewar
Kate Henderson
Jono Mingard
Jorgia Kelsey
Colin Campbell
Liz Rea
Chris Cormack
Srdjan Jankovic
Duncan Tyler
Chris Hall
Duncan Tyler
Chris Nighswonger
MJ Ray
Galen Charlton
Jared Camins-Esakov
Frédéric Demians