Changeset 28560 for main/trunk/greenstone2/bin/script/importfrom.pl

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/bin/script/importfrom.pl (modified) (10 diffs)

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

@@ -40 +40 @@
 use colcfg;
 use util;
+use FileUtils;
 use parsargv;
 use FileHandle;
@@ -62 +63 @@
     print STDERR "   -debug                 Print imported text to STDOUT\n";
     print STDERR "   -collectdir directory  Collection directory (defaults to " .
-    &util::filename_cat ($ENV{'GSDLHOME'}, "collect") . ")\n";
+    &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "collect") . ")\n";
     print STDERR "   -out                   Filename or handle to print output status to.\n";
     print STDERR "                          The default is STDERR\n\n";
@@ -96 +97 @@
 {
     my ($wget_cmd,$out,$verbosity) = @_;
+
+    # 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
 
     if ($verbosity>2) {
@@ -210 +214 @@
     print $out "Getting document $doc_url\n";
 
-    &util::mk_dir($output_dir)  if (!-e "$output_dir");
-
-    my $full_id_fname = &util::filename_cat($output_dir,$id_fname);
+    &FileUtils::makeDirectory($output_dir)  if (!-e "$output_dir");
+
+    my $full_id_fname = &FileUtils::filenameConcatenate($output_dir,$id_fname);
 
     my $wget_cmd = "wget $wgetopt --quiet -O \"$full_id_fname\" \"$doc_url\"";
+
+    # 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
 
     if (system($wget_cmd)!=0) {
@@ -245 +252 @@
     my $i_os = $i; #convert OAI set separators (:) to OS dir sep
     $i_os =~ s/:/$ds/g;
-    my $file_i = &util::filename_cat($output_dir,"$i_os.oai");
+    my $file_i = &FileUtils::filenameConcatenate($output_dir,"$i_os.oai");
 
     # obtain record
     my $wget_cmd = "wget $wgetopt -q -O - \"$url\"";
+
+    # 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
 
     open (OAIIN,"$wget_cmd|")
@@ -267 +277 @@
     my ($i_dir,$unused) = dir_file_split($file_i_url);
 
-    &util::mk_all_dir($i_dir);
+    &FileUtils::makeAllDirectories($i_dir);
 
     # look out for identifier tag in metadata section
@@ -286 +296 @@
 ##          $revised_doc_url =~ s/hdl\.handle\.net/mcgonagall.cs.waikato.ac.nz:8080\/dspace\/handle/;
             
-            my $srcdocs_dir = &util::filename_cat($i_dir,"srcdocs");
+            my $srcdocs_dir = &FileUtils::filenameConcatenate($i_dir,"srcdocs");
 
             if (get_oai_document($revised_doc_url,$srcdocs_dir, $out)) {               
@@ -360 +370 @@
     # get acquire list
     my $acquire = [];
-    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
+    $configfilename = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
     if (-e $configfilename) {
     $collectcfg = &colcfg::read_collect_cfg ($configfilename);
@@ -383 +393 @@
     # fill in the default import directory if none
     # were supplied, turn all \ into / and remove trailing /
-    $importdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "import") if $importdir eq "";
+    $importdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "import") if $importdir eq "";
     $importdir =~ s/[\\\/]+/\//g;
     $importdir =~ s/\/$//;
@@ -391 +401 @@
     print $out "Warning - removing current contents of the import directory\n";
     print $out "          in preparation for the acquire\n";
-    &util::rm_r ($importdir);
+    &FileUtils::removeFilesRecursive($importdir);
     }