Changeset 28560 for main/trunk/greenstone2/bin/script/explode_metadata_database.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/explode_metadata_database.pl (modified) (9 diffs)

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

@@ -14 +14 @@
 use encodings;
 use extrametautil;
+use util;
+use FileUtils;
 use printusage;
 use parse2;
@@ -87 +89 @@
     'type' => "string",
     # parsearg left "" as default
-    #'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
+    #'deft' => &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "collect"),
     'deft' => "",
     'reqd' => "no",
@@ -349 +351 @@
 
     # Explode means just that: the original file is deleted
-    &util::rm($filename);
+    &FileUtils::removeFiles($filename);
     $plugobj->clean_up_after_exploding();
 
@@ -364 +366 @@
     die "Error: document directory $documents_directory already exists (bailing).\n";
     }
-    &util::mk_dir($documents_directory);
-
-    my $documents_metadata_xml_file = &util::filename_cat($documents_directory, "metadata.xml");
+    &FileUtils::makeDirectory($documents_directory);
+
+    my $documents_metadata_xml_file = &FileUtils::filenameConcatenate($documents_directory, "metadata.xml");
     if (-e $documents_metadata_xml_file) {
     die "Error: documents metadata.xml file $documents_metadata_xml_file already exists (bailing).\n";
@@ -427 +429 @@
             # by first of all stripping any trailing slash and then always ensuring one is used through filename_cat
             $document_prefix =~ s/(\/|\\)$//;
-            $document_file_full = &util::filename_cat($document_prefix, "$value$document_suffix");
+            $document_file_full = &FileUtils::filenameConcatenate($document_prefix, "$value$document_suffix");
         } else { # the doc prefix may also contain the prefix of the actual *filename* following the directory
             $document_file_full = $document_prefix . $value . $document_suffix;
@@ -560 +562 @@
     $document_file_full =~ /([^\/]+)$/;
     $document_file_name = $1;
-    $local_document_file = &util::filename_cat($documents_directory, $document_file_name);
+    $local_document_file = &FileUtils::filenameConcatenate($documents_directory, $document_file_name);
+
+    # 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
 
     my $wget_options = "--quiet";
@@ -576 +581 @@
     else {
     # convert the dirseps in filepath to correct dir sep for OS
-    $document_file_full = &util::filename_cat($document_file_full);
+    $document_file_full = &FileUtils::filenameConcatenate($document_file_full);
     my $dir_sep = &util::get_os_dirsep();
 
@@ -588 +593 @@
     if (!$is_absolute) {
         $document_file_full 
-        = &util::filename_cat($orig_base_dir,$document_file_full);
-    }
-
-    $local_document_file = &util::filename_cat($documents_directory, $document_file_name);
+        = &FileUtils::filenameConcatenate($orig_base_dir,$document_file_full);
+    }
+
+    $local_document_file = &FileUtils::filenameConcatenate($documents_directory, $document_file_name);
 
     if (-e $document_file_full) {
-        &util::cp($document_file_full, $documents_directory);
+        &FileUtils::copyFiles($document_file_full, $documents_directory);
     }
     
@@ -606 +611 @@
         # file local to metadata record
         # => copy has been made successfully, so remove original
-        &util::rm($document_file_full);
+        &FileUtils::removeFiles($document_file_full);
         }
     }