Changeset 28066

Timestamp:

2013-08-15T16:42:23+12:00 (11 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed a subtle bug where the timestamped tmp folders generated weren't as unique as they were intended to be because the tmp folders get deleted after a document has been converted to html, so the next timestamped tmp folder generated can be the same because a clash with an existing timestamped folder wasn't detected (since it had already been deleted). This will help with getting diffcol to succeed in the Multimedia tutorial collection.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -226 +226 @@
 }
 
+# These 2 are "static" variables used by the get_timestamped_tmp_folder() subroutine below and
+# belong with that function. They help ensure the timestamped tmp folders generated are unique.
+my $previous_timestamp = undef;
+my $previous_timestamp_f = 0; # frequency
+
 sub get_timestamped_tmp_folder
 {
-
+    
     my $tmp_dirname;
     if(defined $ENV{'GSDLCOLLECTDIR'}) {
@@ -243 +248 @@
     # add the timestamp into the path otherwise we can run into problems 
     # if documents have the same name
-    my $timestamp = time;
+    my $timestamp = time;   
+    
+    if (!defined $previous_timestamp || ($timestamp > $previous_timestamp)) {
+        $previous_timestamp_f = 0;
+        $previous_timestamp = $timestamp;
+    } else {
+        $previous_timestamp_f++;
+    } 
+    
     my $time_tmp_dirname = &FileUtils::filenameConcatenate($tmp_dirname, $timestamp);
-    $tmp_dirname = $time_tmp_dirname;
-    my $i = 1;
+    $tmp_dirname = $time_tmp_dirname;   
+    my $i = $previous_timestamp_f;
+    
+    if($previous_timestamp_f > 0) {
+        $tmp_dirname = $time_tmp_dirname."_".$i;
+        $i++;
+    }
     while (-e $tmp_dirname) {
-    $tmp_dirname = "$time_tmp_dirname$i";
+    $tmp_dirname = $time_tmp_dirname."_".$i;
     $i++;
     }
-    &FileUtils::makeDirectory($tmp_dirname);
- 
+    &FileUtils::makeDirectory($tmp_dirname); 
+
     return $tmp_dirname;
 }