Changeset 21981 for main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

Timestamp:

2010-04-28T15:53:16+12:00 (14 years ago)

Author:

kjdon

Message:

fix for ticket #676. Conversion of pdf to html where two pdfs had the same name would result in the second one overwriting images in hte first one. Fixed by converting in a timestamped folder inside tmp, so no longer in the same folder.

File:

• main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm

@@ -265 +265 @@
     $tmp_dirname = $ENV{'GSDLHOME'};
     }
+
     $tmp_dirname = &util::filename_cat($tmp_dirname, "tmp");
     &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
-   
+
+    # add the timestamp into the path otherwise we can run into problems 
+    # if documents have the same name
+    my $timestamp = time;
+    my $time_tmp_dirname = &util::filename_cat($tmp_dirname, $timestamp);
+    $tmp_dirname = $time_tmp_dirname;
+    my $i = 1;
+    while (-e $tmp_dirname) {
+    $tmp_dirname = "$time_tmp_dirname$i";
+    $i++;
+    }
+    &util::mk_dir($tmp_dirname);
+
     # The following is not necessary and will cause problems with
     # replacing_srcdoc_with_html in the GSDLremote case: