View | Details | Raw Unified | Return to bug 8818
Collapse All | Expand All

(-)a/C4/Biblio.pm (-6 / +5 lines)
Lines 28-33 use MARC::Record; Link Here
28
use MARC::File::USMARC;
28
use MARC::File::USMARC;
29
use MARC::File::XML;
29
use MARC::File::XML;
30
use POSIX qw(strftime);
30
use POSIX qw(strftime);
31
use Module::Load::Conditional qw(can_load);
31
32
32
use C4::Koha;
33
use C4::Koha;
33
use C4::Dates qw/format_date/;
34
use C4::Dates qw/format_date/;
Lines 491-503 sub BiblioAutoLink { Link Here
491
492
492
    my $linker_module =
493
    my $linker_module =
493
      "C4::Linker::" . ( C4::Context->preference("LinkerModule") || 'Default' );
494
      "C4::Linker::" . ( C4::Context->preference("LinkerModule") || 'Default' );
494
    eval { eval {require $linker_module}; };
495
    unless ( can_load( modules => { $linker_module => undef } ) ) {
495
    if ($@) {
496
        $linker_module = 'C4::Linker::Default';
496
        $linker_module = 'C4::Linker::Default';
497
        eval {require $linker_module};
497
        unless ( can_load( modules => { $linker_module => undef } ) ) {
498
    }
498
            return 0, 0;
499
    if ($@) {
499
        }
500
        return 0, 0;
501
    }
500
    }
502
501
503
    my $linker = $linker_module->new(
502
    my $linker = $linker_module->new(
(-)a/misc/link_bibs_to_authorities.pl (-7 / +5 lines)
Lines 18-23 use Pod::Usage; Link Here
18
use Data::Dumper;
18
use Data::Dumper;
19
use Time::HiRes qw/time/;
19
use Time::HiRes qw/time/;
20
use POSIX qw/strftime ceil/;
20
use POSIX qw/strftime ceil/;
21
use Module::Load::Conditional qw(can_load);
21
22
22
sub usage {
23
sub usage {
23
    pod2usage( -verbose => 2 );
24
    pod2usage( -verbose => 2 );
Lines 53-65 if ( not $result or $want_help ) { Link Here
53
54
54
my $linker_module =
55
my $linker_module =
55
  "C4::Linker::" . ( C4::Context->preference("LinkerModule") || 'Default' );
56
  "C4::Linker::" . ( C4::Context->preference("LinkerModule") || 'Default' );
56
eval { eval "require $linker_module"; };
57
unless ( can_load( modules => { $linker_module => undef } ) ) {
57
if ($@) {
58
    $linker_module = 'C4::Linker::Default';
58
    $linker_module = 'C4::Linker::Default';
59
    eval "require $linker_module";
59
    unless ( can_load( modules => { $linker_module => undef } ) ) {
60
}
60
        die "Unable to load linker module. Aborting.";
61
if ($@) {
61
    }
62
    die "Unable to load linker module. Aborting.";
63
}
62
}
64
63
65
my $linker = $linker_module->new(
64
my $linker = $linker_module->new(
66
- 

Return to bug 8818