Bug 9988: Remove further references to dontmerge
authorMarcel de Rooy <m.de.rooy@rijksmuseum.nl>
Wed, 22 Feb 2017 09:53:03 +0000 (10:53 +0100)
committerKyle M Hall <kyle@bywatersolutions.com>
Thu, 13 Apr 2017 12:53:47 +0000 (08:53 -0400)
commitf953cc26e6e9569f6674e6186efc3e37b5c721b2
treebec99db26346322b623d13bfc75f4486f9702fc8
parent04263912c7e413c5dbf13fe61dcdfa4b4912ab56
Bug 9988: Remove further references to dontmerge

[1] The preference was sent to HEA. We can now send both AuthorityMergeMode
    as well as AuthorityMergeLimit.
[2] A comment in authorities/merge.pl is removed. Note that a subsequent
    patch will modify and test the cron job.
[3] Script misc/batchRebuildItemsTables.pl temporarily enabled dontmerge.
    This is equivalent to setting the mergelimit to zero.
    The function defnonull is no longer needed. (If the pref was NULL,
    we restore that value. Sub merge won't mind.)

Test plan:
[1] Run t/db_dependent/UsageStats.t
[2] Run misc/batchRebuildItemsTables.pl -t
    This just ensures you it still compiles; the changes speak for itself.
[3] Now git grep on dontmerge.
    You should only find hits in atomicupdate and misc/translator/po.

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>
C4/UsageStats.pm
authorities/merge.pl
misc/batchRebuildItemsTables.pl
t/db_dependent/UsageStats.t