Changeset 27303 for main/trunk/greenstone2/perllib/parse2.pm

Timestamp:

2013-05-06T15:23:45+12:00 (11 years ago)

Author:

jmt12

Message:

Replacing hardcoded additions to INC and PATH environment variables with conditional ones - this allows us to use the order of values in these variables for precedence, thus allows better support for extensions that override classifiers, plugins etc. ENV and PATH functions already exists in util, but augmentINC() is a new function

File:

• main/trunk/greenstone2/perllib/parse2.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/parse2.pm

@@ -35 +35 @@
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
     die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
+
+    # - ensure perllib paths don't already exist in INC before adding, other-
+    # wise we risk clobbering plugin/classifier inheritence implied by order
+    # of paths in INC [jmt12]
+    my $gsdl_perllib_path = $ENV{'GSDLHOME'} . '/perllib';
+    my $found_path = 0;
+    foreach my $inc_path (@INC)
+    {
+      if ($inc_path eq $gsdl_perllib_path)
+      {
+        $found_path = 1;
+        last;
+      }
+    }
+    if (!$found_path)
+    {
+      unshift (@INC, $gsdl_perllib_path);
+      unshift (@INC, $gsdl_perllib_path . '/cpan');
+    }
 }