Changeset 22887

Timestamp:

2010-09-13T11:01:23+12:00 (13 years ago)

Author:

kjdon

Message:

use new util::get_timestamped_dir, and clean_up_after_doc_processing to delete it

File:

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

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

@@ -231 +231 @@
 
     # 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);
-
-    # The following is not necessary and will cause problems with
-    # replacing_srcdoc_with_html in the GSDLremote case:
-    # Remove any white space from filename -- no risk of name collision, and
-    # makes later conversion by utils simpler. Leave spaces in path...
-    # tidy up the filename with space, dot, hyphen between
-    #$tailname =~ s/\s+//g; 
-    #$tailname =~ s/\.+//g;
-    #$tailname =~ s/\-+//g;
-
+    my $tmp_dirname = &util::get_timestamped_tmp_folder();
+    if (defined $tmp_dirname) {
+    $self->{'tmp_dir'} = $tmp_dirname;
+    } else {
+    $tmp_dirname = $dirname;
+    }
+    
     # convert to utf-8 otherwise we have problems with the doc.xml file later on
 #    print STDERR "**** filename $tailname$suffix is already UTF8\n" if &unicode::check_is_utf8($tailname);
@@ -493 +469 @@
 }
 
+sub clean_up_after_doc_obj_processing {
+     my $self = shift(@_);
+
+     my $tmp_dir = $self->{'tmp_dir'};
+     if (defined $tmp_dir && -d $tmp_dir) {
+     &util::rm_r($tmp_dir);
+     $self->{'tmp_dir'} = undef;
+     }
+     
+
+}
 1;