Changeset 28560 for main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm

Timestamp:

2013-10-30T20:54:49+13:00 (10 years ago)

Author:

ak19

Message:

1. New subroutine util::set_gnomelib_env that sets the environment for gnomelib needed for running hashfile, suffix and wget which are dependent on the libiconv dll in ext/gnome-lib(-minimal). It's particularly the Mac Lions that need libiconv.2.dylib. 2. Updated the call to hashfile in doc.pm, the call to suffix in Phind.pm and the calls to wget in several perl scripts and modules to call util::set_gnomelib_env, though this will only set the environment once for each subshell.

File:

• main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm

@@ -37 +37 @@
 use MetadataRead;
 use util;
+use FileUtils;
 use XMLParser;
 use Cwd;
@@ -582 +583 @@
     my $output_dir = $self->{'output_dir'};
 
-    $output_dir = &util::filename_cat($output_dir,"_gsdldown.all");
+    $output_dir = &FileUtils::filenameConcatenate($output_dir,"_gsdldown.all");
 
     if (! -d $output_dir) {
@@ -596 +597 @@
     $file_url .= "index.html" if ($file_url =~ m/\/$/);
 
-    my $full_file_url = &util::filename_cat($output_dir,$file_url);
+    my $full_file_url = &FileUtils::filenameConcatenate($output_dir,$file_url);
     # the path to srcdoc will be used later in extrametadata to associate
     # the lom metadata with the document. Needs to be relative to current
     # directory.
-    my $srcdoc_path = &util::filename_cat("_gsdldown.all", $file_url);
+    my $srcdoc_path = &FileUtils::filenameConcatenate("_gsdldown.all", $file_url);
     my $check_timestamp = $self->{'check_timestamp'};
     my $status;
@@ -628 +629 @@
     }
     ##print STDERR "**** wget = $wget_cmd\n";
-
+    
+    # the wget binary is dependent on the gnomelib_env (particularly lib/libiconv2.dylib) being set, particularly on Mac Lions (android too?)
+    &util::set_gnomelib_env(); # this will set the gnomelib env once for each subshell launched, by first checking if GEXTGNOME is not already set
     
     $status = system($wget_cmd);