Changeset 27634

Timestamp:

2013-06-17T17:47:45+12:00 (11 years ago)

Author:

ak19

Message:

Changed order of @INC 'unshifts' due to clash over Greenstone own XMLParser.pm and XML/XPath/XMLParser. We want it to find our one first in @INC.

File:

• main/trunk/greenstone2/bin/script/buildcol.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -35 +35 @@
   die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
   die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
+
+  # Order is important. With unshift want our XMLParser to be 
+  # found ahead of XML/XPath
+
+  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan/XML/XPath');
+  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/classify');
+  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/plugins');
+  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan');
   unshift (@INC, $ENV{'GSDLHOME'} . '/perllib');
-  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan');
-  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan/XML/XPath');
-  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/plugins');
-  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/classify');
 
   if (defined $ENV{'GSDL-RUN-SETUP'})