@@ -, +, @@ as well as AuthorityMergeLimit. patch will modify and test the cron job. 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.) This just ensures you it still compiles; the changes speak for itself. You should only find hits in atomicupdate and misc/translator/po. --- C4/UsageStats.pm | 3 ++- authorities/merge.pl | 1 - misc/batchRebuildItemsTables.pl | 14 ++++---------- t/db_dependent/UsageStats.t | 3 ++- 4 files changed, 8 insertions(+), 13 deletions(-) --- a/C4/UsageStats.pm +++ a/C4/UsageStats.pm @@ -96,7 +96,8 @@ sub BuildReport { AuthDisplayHierarchy AutoCreateAuthorities BiblioAddsAuthorities - dontmerge + AuthorityMergeLimit + AuthorityMergeMode UseAuthoritiesForTracings CatalogModuleRelink hide_marc --- a/authorities/merge.pl +++ a/authorities/merge.pl @@ -62,7 +62,6 @@ if ($merge) { ModAuthority( $recordid1, $record, $typecode ); # Now merge for biblios attached to $recordid2 - # We ignore dontmerge now, since recordid2 is deleted my $MARCfrom = GetAuthority( $recordid2 ); merge({ mergefrom => $recordid2, MARCfrom => $MARCfrom, mergeto => $recordid1, MARCto => $record }); --- a/misc/batchRebuildItemsTables.pl +++ a/misc/batchRebuildItemsTables.pl @@ -52,10 +52,9 @@ $dbh->{AutoCommit} = 0; #sysprefs C4::Context->disable_syspref_cache() if ( defined( C4::Context->disable_syspref_cache() ) ); my $CataloguingLog = C4::Context->preference('CataloguingLog'); -my $dontmerge = C4::Context->preference('dontmerge'); -$dontmerge = "0" unless defnonull($dontmerge); +my $mergelimit = C4::Context->preference('AuthorityMergeLimit'); $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='CataloguingLog'"); -$dbh->do("UPDATE systempreferences SET value=1 where variable='dontmerge'"); +$dbh->do("UPDATE systempreferences SET value=0 where variable='AuthorityMergeLimit'"); $dbh->commit() unless $test_parameter; my ( $itemfield, $itemnumbersubfield ) = &GetMarcFromKohaField( "items.itemnumber", '' ); @@ -98,16 +97,11 @@ while ( my ( $biblionumber, $biblioitemnumber, $frameworkcode ) = $sth->fetchrow my $sthCataloguingLog = $dbh->prepare("UPDATE systempreferences SET value=? WHERE variable='CataloguingLog'"); $sthCataloguingLog->execute($CataloguingLog); -my $sthdontmerge = $dbh->prepare("UPDATE systempreferences SET value=? WHERE variable='dontmerge'"); -$sthdontmerge->execute($dontmerge); +my $sthmergelimit = $dbh->prepare("UPDATE systempreferences SET value=? WHERE variable='AuthorityMergeLimit'"); +$sthmergelimit->execute($mergelimit); $dbh->commit() unless $test_parameter; my $timeneeded = time() - $starttime; print "$count MARC record done in $timeneeded seconds\n"; if ( scalar(@errors) > 0 ) { print "Some biblionumber could not be processed though: ", join( " ", @errors ); } - -sub defnonull { - my $var = shift; - return defined $var && $var ne q{}; -} --- a/t/db_dependent/UsageStats.t +++ a/t/db_dependent/UsageStats.t @@ -348,7 +348,8 @@ sub mocking_systempreferences_to_a_set_value { AuthDisplayHierarchy AutoCreateAuthorities BiblioAddsAuthorities - dontmerge + AuthorityMergeLimit + AuthorityMergeMode UseAuthoritiesForTracings CatalogModuleRelink hide_marc --