Changeset 22873

Timestamp:

2010-09-07T14:39:06+12:00 (13 years ago)

Author:

kjdon

Message:

new subroutine get_timestamped_tmp_filename_in_collection, which does just that

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -663 +663 @@
 }
 
+sub get_timstamped_tmp_filename_in_collection
+{
+
+    my ($input_filename, $output_ext) = @_;
+    # derive tmp filename from input filename
+    my ($tailname, $dirname, $suffix)
+    = &File::Basename::fileparse($input_filename, "\\.[^\\.]+\$");
+
+    # softlink to collection tmp dir
+    my $tmp_dirname = $dirname;
+    if(defined $ENV{'GSDLCOLLECTDIR'}) {
+    $tmp_dirname = $ENV{'GSDLCOLLECTDIR'};
+    } elsif(defined $ENV{'GSDLHOME'}) {
+    $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);
+ 
+
+    # following two steps copied from ConvertBinaryFile
+    #$tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname);
+
+    # URLEncode this since htmls with images where the html filename is utf8 don't seem
+    # to work on Windows (IE or Firefox), as browsers are looking for filesystem-encoded
+    # files on the filesystem.
+    #$tailname = &util::rename_file($tailname, $self->{'file_rename_method'}, "without_suffix");
+    if (defined $output_ext) {
+    $output_ext = ".$output_ext"; # add the dot
+    } else {
+    $output_ext = $suffix;
+    }
+    $output_ext= lc($output_ext);
+    my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$output_ext");
+    
+    return $tmp_filename;
+}
+
 sub get_toplevel_tmp_dir
 {