Changeset 27041

Timestamp:

2013-03-12T11:24:11+13:00 (11 years ago)

Author:

jmt12

Message:

INC path now includes the installed extensions perl path (including looking for the correct version number)

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/parse_task_info_from_hadoop_log.pl (modified) (1 diff)

gs2-extensions/parallel-building/trunk/src/bin/script/parse_task_info_from_hadoop_log.pl

@@ -16 +16 @@
   die "HDFS HOST not set (set in <gsdl>/ext/parallel_processing/setup.bash)\n" unless defined $ENV{'HDFSHOST'};
   die "HDFS PORT not set (set in <gsdl>/ext/parallel_processing/setup.bash)\n" unless defined $ENV{'HDFSPORT'};
-
-  unshift (@INC, $ENV{'GEXTPARALLELBUILDING'} . '/perllib/cpan');
+  # Ensure Greenstone Perl locations are in INC
+  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib');
+  unshift (@INC, $ENV{'GSDLHOME'} . '/perllib/cpan');
+  # we'll need the perl version number
+  my ($version_number) = $^V =~ /(\d+\.\d+\.\d+)/;
+  if (defined $ENV{'GSDLEXTS'})
+  {
+    my @extensions = split(/:/,$ENV{'GSDLEXTS'});
+    foreach my $e (@extensions)
+    {
+      my $ext_prefix = $ENV{'GSDLHOME'} . '/ext/' . $e;
+      unshift (@INC, $ext_prefix . '/perllib');
+      unshift (@INC, $ext_prefix . '/perllib/cpan');
+      unshift (@INC, $ext_prefix . '/' . $ENV{'GSDLOS'} . '/lib/perl/' . $version_number);
+    }
+  }
 }