Changeset 28560 for main/trunk/greenstone2/perllib/plugins

Timestamp:

2013-10-30T20:54:49+13:00 (11 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.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• LOMPlugin.pm (modified) (4 diffs)
• MediaWikiPlugin.pm (modified) (7 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);

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

@@ -35 +35 @@
 use HTMLPlugin;
 use unicode;
+use util;
+use FileUtils;
 
 use strict; # every perl program should have this!
@@ -218 +220 @@
         $css_files[$css_file_count++] = $2 if defined $2;
     }
+
+    # Set the env for wget once, outside the for loop
+    # 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
         
     # download the stylesheets if we haven't downloaded them yet
@@ -238 +244 @@
         $css_file =~ s/\?(.+)$//isg;  
        
-            my $css_file_path = &util::filename_cat($base_dir, $css_file);      
+            my $css_file_path = &FileUtils::filenameConcatenate($base_dir, $css_file);      
         
         # do nothing if we have already downloaded the css files
@@ -251 +257 @@
         mkdir($path_check) if (! -d $path_check );
          }
-         
+
              # NOTE: wget needs configuration to directly access Internet
              # These files should already downloaded if we used the MediaWikiDownload             
@@ -293 +299 @@
             $style_dir =~ s/import$/style/;
             $css_file =~ m/(.*)\/(.*)$/;
-            $style_dir = &util::filename_cat($style_dir, $2);            
+            $style_dir = &FileUtils::filenameConcatenate($style_dir, $2);            
             
             if(open(OUTPUT, ">$style_dir")){    
@@ -477 +483 @@
         my $macro_path = $base_dir;
         $macro_path =~ s/import$/macros/;       
-        my $extradm_file = &util::filename_cat($macro_path, "extra.dm");        
+        my $extradm_file = &FileUtils::filenameConcatenate($macro_path, "extra.dm");        
         
         my $extra_dm = "";
@@ -644 +650 @@
     my $self = shift(@_);
 
-  my $about_macro_file = &util::filename_cat($ENV{'GSDLHOME'}, "macros", "about.dm");
+  my $about_macro_file = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "macros", "about.dm");
   my $about_page_content = "";
   if (open(INPUT, "<$about_macro_file")){