Ignore:
Timestamp:
2007-05-30T17:55:36+12:00 (17 years ago)
Author:
sjboddie
Message:

More modifications to support additional collection-level customisations
to be put in gsdl/collect/COLLECTION/custom/COLLECTION. basebuilder.pm,
classify.pm, colcfg.pm, and plugin.pm were modified to allow
collection-specific plugins, classifiers, builders, and buildprocs to
be located in the new locations. These changes should not have any effect
on existing collections.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/perllib/plugin.pm

    r13933 r14112  
    4848
    4949    # find the plugin
    50     my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins",
     50    my $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'},
     51                                             'perllib', 'plugins', "${pluginname}.pm");
     52    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'perllib', 'plugins',
    5153                      "${pluginname}.pm");
    52     my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/plugins",
     54    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, 'perllib', 'plugins',
    5355                       "${pluginname}.pm");
    54     if (-e $colplugname) { require $colplugname; }
     56    if (-e $customplugname) { require $customplugname; }
     57    elsif (-e $colplugname) { require $colplugname; }
    5558    elsif (-e $mainplugname) { require $mainplugname; }
    5659    else {
    … …  
    9194
    9295    # find the plugin
    93     my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins",
     96        my $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'},
     97                                                 'perllib', 'plugins', "${pluginname}.pm");
     98    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'perllib', 'plugins',
    9499                          "${pluginname}.pm");
    95     my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/plugins",
     100    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, 'perllib', 'plugins',
    96101                           "${pluginname}.pm");
    97     if (-e $colplugname) { require $colplugname; }
     102        if (-e $customplugname) { require $customplugname; }
     103    elsif (-e $colplugname) { require $colplugname; }
    98104    elsif (-e $mainplugname) { require $mainplugname; }
    99105    else {
Note: See TracChangeset for help on using the changeset viewer.