Changeset 30574 for main/trunk/greenstone2

Timestamp:

16.06.2016 19:20:23 (3 years ago)

Author:

ak19

Message:

Improving dispersed GS3: changes to util.pm fix the bug whereby the perl code always write to gs2build\tmp when building, even if the Greenstone folder is not writable. Now the TMP env var location is used and the tmp files get written to TMP\greenstone\web when the GS folder is not writable. Further tidied up bat and cmd files to remove extra variables, to break out of loop reading in build.properties file when the necessary properties are found.

Files:

• main/trunk/greenstone2/perllib/util.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -234 +234 @@
 
 
+# works out the temporary directory, including in the case where Greenstone is not writable
+# In that case, gs3-setup.bat would already have set the GS_TMP_OUTPUT_DIR temp variable
+sub determine_tmp_dir
+{
+    my $try_collect_dir = shift(@_) || 0;
+
+    my $tmp_dirname;
+    if(defined $ENV{'GS_TMP_OUTPUT_DIR'}) {
+        $tmp_dirname = $ENV{'GS_TMP_OUTPUT_DIR'};
+    } elsif($try_collect_dir && defined $ENV{'GSDLCOLLECTDIR'}) {
+        $tmp_dirname = $ENV{'GSDLCOLLECTDIR'};
+    } elsif(defined $ENV{'GSDLHOME'}) {
+        $tmp_dirname = $ENV{'GSDLHOME'};
+    } else {
+        return undef;
+    }
+    
+    if(!defined $ENV{'GS_TMP_OUTPUT_DIR'}) {
+        # test the tmp_dirname folder is writable, by trying to write out a file
+        # Unfortunately, cound not get if(-w $dirname) to work on directories on Windows
+            ## http://alvinalexander.com/blog/post/perl/perl-file-test-operators-reference-cheat-sheet (test file/dir writable)
+            ## http://www.makelinux.net/alp/083 (real and effective user IDs)
+        
+        my $tmp_test_file = &FileUtils::filenameConcatenate($tmp_dirname, "writability_test.tmp");
+        if (open (FOUT, $tmp_test_file)) {
+            close(FOUT);
+            &FileUtils::removeFiles($tmp_test_file);
+        } else { # location not writable, use TMP location
+            $tmp_dirname = &FileUtils::filenameConcatenate($ENV{'TMP'}, "greenstone");
+            $ENV{'GS_TMP_OUTPUT_DIR'} = $tmp_dirname; # store for next time
+        }
+    }
+    
+    $tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname, "tmp");
+    &FileUtils::makeAllDirectories ($tmp_dirname) unless -e $tmp_dirname;
+
+    return $tmp_dirname;
+}
+
 sub get_tmp_filename 
 {
@@ -251 +290 @@
     }
 
-    my $tmpdir = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "tmp");
-    &FileUtils::makeAllDirectories ($tmpdir) unless -e $tmpdir;
+    my $tmpdir = &util::determine_tmp_dir(0);
 
     my $count = 1000;
@@ -274 +312 @@
 sub get_timestamped_tmp_folder
 {
-    
-    my $tmp_dirname;
-    if(defined $ENV{'GSDLCOLLECTDIR'}) {
-    $tmp_dirname = $ENV{'GSDLCOLLECTDIR'};
-    } elsif(defined $ENV{'GSDLHOME'}) {
-    $tmp_dirname = $ENV{'GSDLHOME'};
-    } else {
-    return undef;
-    }
-
-    $tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname, "tmp");
-    &FileUtils::makeDirectory($tmp_dirname) if (!-e $tmp_dirname);
-
+    my $tmp_dirname = &util::determine_tmp_dir(1);
+    
     # add the timestamp into the path otherwise we can run into problems 
     # if documents have the same name