Changeset 22886

Timestamp:

2010-09-13T11:00:21+12:00 (14 years ago)

Author:

kjdon

Message:

new method get_timestamped_tmp_folder, used by ConvertBinaryFile and get_timestamped_tmp_filename_in_collection

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -663 +663 @@
 }
 
-sub get_timestamped_tmp_filename_in_collection
+sub get_timestamped_tmp_folder
 {
 
-    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;
+    my $tmp_dirname;
     if(defined $ENV{'GSDLCOLLECTDIR'}) {
     $tmp_dirname = $ENV{'GSDLCOLLECTDIR'};
     } elsif(defined $ENV{'GSDLHOME'}) {
     $tmp_dirname = $ENV{'GSDLHOME'};
+    } else {
+    return undef;
     }
 
@@ -694 +690 @@
     &util::mk_dir($tmp_dirname);
  
+    return $tmp_dirname;
+}
+
+sub get_timestamped_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 = &util::get_timestamped_tmp_folder();
+    $tmp_dirname = $dirname unless defined $tmp_dirname;
 
     # following two steps copied from ConvertBinaryFile
+    # do we need them?? can't use them as is, as they use plugin methods.
+
     #$tailname = $self->SUPER::filepath_to_utf8($tailname) unless &unicode::check_is_utf8($tailname);