Changeset 28560 for main/trunk/greenstone2/perllib/g2futil.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/g2futil.pm (modified) (13 diffs)

main/trunk/greenstone2/perllib/g2futil.pm

@@ -9 +9 @@
     }
 
-    my $fedora_client_bin = &util::filename_cat($ENV{'FEDORA_HOME'},"client","bin");
+    my $fedora_client_bin = &FileUtils::filenameConcatenate($ENV{'FEDORA_HOME'},"client","bin");
     &util::envvar_append("PATH",$fedora_client_bin);
 }
@@ -15 +15 @@
 use strict;
 use util;
+use FileUtils;
 
 sub run_cmd_old
@@ -186 +187 @@
     #$ENV{'fgsPassword'} = $options->{'password'};    
 
-    #my $prog = &util::filename_cat($ENV{'FEDORA_GSEARCH'}, "runRESTClient.sh");
-    my $prog = &util::filename_cat($fedoragsearch_webapp, "client", "runRESTClient.sh");
+    #my $prog = &FileUtils::filenameConcatenate($ENV{'FEDORA_GSEARCH'}, "runRESTClient.sh");
+    my $prog = &FileUtils::filenameConcatenate($fedoragsearch_webapp, "client", "runRESTClient.sh");
 
     my $gsearch_commands = "updateIndex deletePid"; # deletePID
@@ -214 +215 @@
     #$ENV{'fgsPassword'} = $options->{'password'};    
 
-    #my $prog = &util::filename_cat($ENV{'FEDORA_GSEARCH'}, "runRESTClient.sh");
-    my $prog = &util::filename_cat($fedoragsearch_webapp, "client", "runRESTClient.sh");
+    #my $prog = &FileUtils::filenameConcatenate($ENV{'FEDORA_GSEARCH'}, "runRESTClient.sh");
+    my $prog = &FileUtils::filenameConcatenate($fedoragsearch_webapp, "client", "runRESTClient.sh");
     
     my $gsearch_commands = "updateIndex fromPid"; # fromPID
@@ -231 +232 @@
     # if GS3, first look for a fedoragsearch webapp installed in Greenstone's tomcat
     if(defined $ENV{'GSDL3SRCHOME'}) {
-    $fedoragsearch_webapp = &util::filename_cat($ENV{'GSDL3SRCHOME'},"packages","tomcat","webapps","fedoragsearch");    
-    return $fedoragsearch_webapp if (&util::dir_exists($fedoragsearch_webapp));
+    $fedoragsearch_webapp = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"packages","tomcat","webapps","fedoragsearch");    
+    return $fedoragsearch_webapp if (&FileUtils::directoryExists($fedoragsearch_webapp));
     }
 
     # next look for a fedoragsearch webapp installed in Fedora's tomcat
     if(defined $ENV{'FEDORA_HOME'}) {
-    $fedoragsearch_webapp =  &util::filename_cat($ENV{'FEDORA_HOME'},"tomcat","webapps","fedoragsearch");
-    return $fedoragsearch_webapp if (&util::dir_exists($fedoragsearch_webapp));
+    $fedoragsearch_webapp =  &FileUtils::filenameConcatenate($ENV{'FEDORA_HOME'},"tomcat","webapps","fedoragsearch");
+    return $fedoragsearch_webapp if (&FileUtils::directoryExists($fedoragsearch_webapp));
     }
 
@@ -287 +288 @@
 
     if (opendir(DIR, $full_dir)) {
-    my @sub_dirs = grep { ($_ !~ /^\./) && (-d &util::filename_cat($full_dir,$_)) } readdir(DIR);
+    my @sub_dirs = grep { ($_ !~ /^\./) && (-d &FileUtils::filenameConcatenate($full_dir,$_)) } readdir(DIR);
     closedir DIR;
 
@@ -294 +295 @@
     
     foreach my $hd (@hash_dirs) {
-        my $full_hash_dir = &util::filename_cat($full_dir,$hd);
+        my $full_hash_dir = &FileUtils::filenameConcatenate($full_dir,$hd);
         push(@$all_dirs,$full_hash_dir);
     }
 
     foreach my $rd (@rec_dirs) {
-        my $full_rec_dir = &util::filename_cat($full_dir,$rd);
+        my $full_rec_dir = &FileUtils::filenameConcatenate($full_dir,$rd);
         rec_get_all_hash_dirs($full_rec_dir,$all_dirs);
     }       
@@ -329 +330 @@
     my $hash_id = undef;
 
-    my $docmets_filename = &util::filename_cat($hash_dir,"docmets.xml");
+    my $docmets_filename = &FileUtils::filenameConcatenate($hash_dir,"docmets.xml");
 
     if (open(DIN,"<$docmets_filename"))
@@ -372 +373 @@
     # to temporarily set CATALINA_HOME to fedora's tomcat. (Catalina is undefined for GS2.)
     my $gs_catalina_home = $ENV{'CATALINA_HOME'} if defined $ENV{'CATALINA_HOME'};
-    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat");
+    $ENV{'CATALINA_HOME'} = &FileUtils::filenameConcatenate($ENV{'FEDORA_HOME'}, "tomcat");
     
     # 1. Find out which folder to write to: fedora_host or localhost 
     # whichever contains fedora.xml is the one we want (if none, exit with error value?)
     my $fedora_home = $ENV{'FEDORA_HOME'};
-    my $base_path = &util::filename_cat($fedora_home, "tomcat", "conf", "Catalina");
-
-    my $host_path = &util::filename_cat($base_path, $fedora_host);
-    my $xmlFile = &util::filename_cat($host_path, "fedora.xml");
+    my $base_path = &FileUtils::filenameConcatenate($fedora_home, "tomcat", "conf", "Catalina");
+
+    my $host_path = &FileUtils::filenameConcatenate($base_path, $fedora_host);
+    my $xmlFile = &FileUtils::filenameConcatenate($host_path, "fedora.xml");
     if (!-e $xmlFile) {
     # check if the folder localhost contains fedoraXML
-    $host_path = &util::filename_cat($base_path, "localhost");
-    $xmlFile = &util::filename_cat($host_path, "fedora.xml");
+    $host_path = &FileUtils::filenameConcatenate($base_path, "localhost");
+    $xmlFile = &FileUtils::filenameConcatenate($host_path, "fedora.xml");
     if(!-e $xmlFile) {
         # try putting gsdl in this folder, but still print a warning
@@ -405 +406 @@
     # 3. If there is already a gsdl.xml file in host_path, compare the string we
     # want to write with what is already in there. If they're the same, we can return
-    $xmlFile = &util::filename_cat($host_path, "gsdl.xml");
+    $xmlFile = &FileUtils::filenameConcatenate($host_path, "gsdl.xml");
     if(-e $xmlFile) {
     # such a file exists, so read the contents
@@ -428 +429 @@
     # a. First stop the fedora server
     my $script_ext = ($ENV{'GSDLOS'} =~ m/^windows/) ? ".bat" : ".sh";
-    my $stop_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "shutdown".$script_ext);
+    my $stop_tomcat = &FileUtils::filenameConcatenate($fedora_home, "tomcat", "bin", "shutdown".$script_ext);
     # execute the command 
     $! = 0; # does this initialise the return value?
@@ -447 +448 @@
 
     # c. Restart the fedora server
-    my $start_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "startup".$script_ext);
+    my $start_tomcat = &FileUtils::filenameConcatenate($fedora_home, "tomcat", "bin", "startup".$script_ext);
     $! = 0;
     $status = system($start_tomcat);
@@ -458 +459 @@
     $ENV{'CATALINA_HOME'} = $gs_catalina_home if defined $gs_catalina_home;
     
+    # 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
+
     # Starting up the Fedora server takes a long time. We need to wait for the server to be
     # ready before import can continue, because g2f-import relies on an up-and-running Fedora