Main Koha release repository https://koha-community.org
Find a file
Marcel de Rooy 04263912c7 Bug 9988: Check the merge limit in sub merge
At this point, we are replacing dontmerge functionality by the new
AuthorityMergeLimit logic. Instead of doing this check before calling
merge, we just call merge and check it there. In order to let the cron
job do the larger (postponed) merges, we add a parameter override_limit.

A subtest is added in Merge.t to test the 'postponed merge' feature. Since
merge now also calls get_usage_count, an additional mock is added. All
references to dontmerge are removed.

In merge two lines, initializing $dbh and $counteditbiblios, are moved.
The dontmerge test in DelAuthority and ModAuthority is removed. Since this
did not leave much in ModAuthority, I fixed the whitespace on the remaining
lines rightaway (yes, I know).
A minimal set of changes is applied to the cron script; it will get further
attention on a next patch.

Test plan:
[1] Run t/db_dependent/Authorities/Merge.t
[2] Set AuthorityMergeLimit to 2. Modify an authority with two linked
    biblios. Check that the merge was done immediately.
[3] Now modify an authority with more than 2 linked records.
    Verify that the merge was postponed; a record must be inserted in
    the need_merge_authorities table.
[4] Testing of the merge cron job is *postponed* to a next patch.
    Note: I tested a modification, but the script just needs more
    attention.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2017-04-13 08:53:46 -04:00
acqui Bug 14535: Update the supplier filter too 2017-03-31 12:38:44 +00:00
admin Bug 17872: Fix small error in GetBudgetHierarchy and one of its calls 2017-04-13 08:34:15 -04:00
api/v1 Bug 17927: (QA followup) Fix timestamp nullable in hold.json 2017-02-07 17:55:43 +00:00
authorities Bug 9988: Merge should have a parameter hash 2017-04-13 08:53:46 -04:00
basket Bug 18124: Change the calls to generate and check CSRF tokens 2017-03-30 09:07:09 +00:00
C4 Bug 9988: Check the merge limit in sub merge 2017-04-13 08:53:46 -04:00
catalogue Bug 18394: Add an option to item search to export a barcodes file 2017-04-13 08:52:50 -04:00
cataloguing Bug 17233 - Add 008 value builder plugin for MARC21 classifications 2017-03-31 13:48:16 +00:00
circ Bug 17737: Rename holds_placed_before_today with current_holds 2017-04-13 08:49:12 -04:00
course_reserves Bug 18264 - (QA Followup) Remove use of GetBiblioFromItemNumber Replace <blank> with (blank) 2017-03-22 19:04:43 +00:00
debian Bug 18069: Remove residue of rebuild_zebra -x 2017-03-22 21:14:31 +00:00
docs Bug 7143: Add Patricio Marrone to history.txt 2017-03-31 13:45:33 +00:00
errors
etc Bug 15427 : Enable TLS support for MySQL 2017-03-03 18:33:07 +00:00
installer Bug 9988: Table revision for need_merge_authorities 2017-04-13 08:53:46 -04:00
Koha Bug 9988: Add get_usage_count and linked_biblionumbers to Koha::Authority 2017-04-13 08:53:46 -04:00
koha-tmpl Bug 9988: Database revision for AuthorityMergeLimit 2017-04-13 08:53:46 -04:00
labels Bug 17900: Fix possible SQL injection in patron cards template editing 2017-01-30 11:19:55 +00:00
members Bug 15498: Do not display sql csv profiles 2017-03-31 11:13:48 +00:00
misc Bug 9988: Check the merge limit in sub merge 2017-04-13 08:53:46 -04:00
offline_circ Bug 17501: Remove Koha::Upload::get from Koha::Upload 2017-01-20 14:20:05 +00:00
opac Bug 17737: [QA Follow-up] Remove unused reservedfor variable 2017-04-13 08:49:12 -04:00
OpenILS
patron_lists
patroncards Bug 18246: Patron card creator: Unit not always displays properly in layouts 2017-03-22 20:58:10 +00:00
plugins
reports Bug 14365 - Populate never used saved_sql column last_run when execute_query is called 2017-03-31 13:54:22 +00:00
reserve Bug 17737: Rename holds_placed_before_today with current_holds 2017-04-13 08:49:12 -04:00
reviews
rotating_collections
serials Bug 18181: Can't tell which subscriptions already have a routing list if seeing all subs attached to a biblio 2017-03-31 13:51:12 +00:00
services
skel Bug 11078: Add locking to rebuild_zebra 2014-02-28 22:21:41 +00:00
sms
suggestion Bug 17252 - Koha::AuthorisedValues - Remove GetAuthorisedValueByCode 2016-10-21 15:35:21 +00:00
svc Bug 14365 - Populate never used saved_sql column last_run when execute_query is called 2017-03-31 13:54:22 +00:00
t Bug 9988: Check the merge limit in sub merge 2017-04-13 08:53:46 -04:00
tags
test
tmp/modified_authorities
tools Bug 9988: Merge should have a parameter hash 2017-04-13 08:53:46 -04:00
virtualshelves Bug 7663: Fix bad merge conflict with bug 15584 2017-03-03 18:18:14 +00:00
xt
.editorconfig
.htaccess
.mailmap
about.pl Bug 17990: Refactor Perl module versions check 2017-02-17 12:13:44 +00:00
changelanguage.pl
edithelp.pl Bug 16447: Remove occurrence of the borrow permission which does no longer exist 2016-05-05 21:28:14 +00:00
fix-perl-path.PL
help.pl Bug 16724: Fix link to the online documentation links 2016-06-24 12:00:42 +00:00
INSTALL Bug 17626: Remove existing install instructions and link to the wiki pages instead 2016-11-22 11:29:07 +00:00
install-CPAN.pl
Koha.pm Bug 17866 - DBRev 16.12.00.022 2017-03-31 13:22:37 +00:00
koha_perl_deps.pl Bug 17990: Refactor Perl module versions check 2017-02-17 12:13:44 +00:00
kohaversion.pl Bug 13758: Move the Koha version from kohaversion.pl 2015-05-07 11:39:04 -03:00
LICENSE
mainpage.pl Bug 14610 - Add and update scripts 2016-10-26 12:15:14 +00:00
Makefile.PL Bug 15427 : Enable TLS support for MySQL 2017-03-03 18:33:07 +00:00
MANIFEST.SKIP Bug 9546 : Updating make manifest tardist 2013-02-06 23:54:46 -05:00
README
README.md Bug 15465 [QA Followup] - Update wording, switch logo, add links 2016-02-24 04:02:26 +00:00
README.robots
rewrite-config.PL Bug 15427 : Enable TLS support for MySQL 2017-03-03 18:33:07 +00:00

Koha is a free software integrated library system (ILS).

Koha is distributed under the GNU GPL version 3 or later.

Note: This is a synced mirror of the official Koha repo.

Note: Koha does not accept pull requests from git hosting sites.

Note: This project has its own bug tracker, to report a bug or submit a patch visit http://bugs.koha-comminity.org.

For guidelines on submitting patches for Koha please visit https://wiki.koha-community.org/wiki/SubmitingAPatch

The developers handbook can be found at https://wiki.koha-community.org/wiki/Developer_handbook

http://koha-community.org/

Koha Logo