Changeset 16266 for gsdl

Timestamp:

2008-07-02T08:51:56+12:00 (16 years ago)

Author:

davidb

Message:

get_tmp_filename() can now optionally take an argument that is the file name extension to use. Without this ImageConverter would get a temp filename, append a .gif (or whatever) extension on to it and use this a the filename to convert an image to. The problem came when get_tmp_filename randomly generates the same filename again: when it looks to see if its random name already exists, it gets the answer no (because it doesn't use a filename extension, but the one used by ImageConverter does). Getting modules like ImageConverter to pass in the filename extension they plan to use fixes this.

File:

• gsdl/trunk/perllib/util.pm (modified) (3 diffs)

gsdl/trunk/perllib/util.pm

@@ -572 +572 @@
 
 
-sub get_tmp_filename {
+sub get_tmp_filename 
+{
+    my $file_ext = shift(@_) || undef;
+
+    my $opt_dot_file_ext = (defined $file_ext) ? ".$file_ext" : "";
+
     my $tmpdir = filename_cat($ENV{'GSDLHOME'}, "tmp");
     &mk_all_dir ($tmpdir) unless -e $tmpdir;
@@ -578 +583 @@
     my $count = 1000;
     my $rand = int(rand $count);
-    while (-e &filename_cat($tmpdir, "F$rand")) {
+    my $full_tmp_filename = &filename_cat($tmpdir, "F$rand$opt_dot_file_ext");
+
+    while (-e $full_tmp_filename) {
     $rand = int(rand $count);
+    $full_tmp_filename = &filename_cat($tmpdir, "F$rand$opt_dot_file_ext");
     $count++;
     }
-
-    return filename_cat($tmpdir, "F$rand");
+    
+    return $full_tmp_filename;
 }
 
@@ -591 +599 @@
     my (@filenames) = @_;
 
-#   Useful for debugging
-#   my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(0);
+#   Useful for debugging 
+#     -- might make sense to call caller(0) rather than (1)??
+#   my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
 #   print STDERR "Calling method; $cfilename:$cline $cpackage->$csubr\n";