Changeset 26223 for main/trunk/greenstone2

Timestamp:

2012-09-20T09:37:50+12:00 (12 years ago)

Author:

kjdon

Message:

some mods to allow collection specific perl modules

File:

• main/trunk/greenstone2/perllib/plugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugin.pm

@@ -129 +129 @@
     foreach my $plugname (@check_list) {
     if (-e $plugname) {
+        # lets add perllib folder to INC
+        my ($perllibfolder) = $plugname =~ /^(.*[\/\\]perllib)[\/\\]plugins/;
+        if (-d $perllibfolder) {
+        unshift (@INC, $perllibfolder);
+        } 
         require $plugname;
         $success=1;
@@ -166 +171 @@
     $failhandle = 'STDERR' unless defined $failhandle;
 
-    my $colplugindir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins");
+    my $colperllibdir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib");
+    unshift (@INC, $colperllibdir);  
+    my $colplugindir = &util::filename_cat($colperllibdir,"plugins");
      unshift (@INC, $colplugindir);