Changeset 22438 for main/trunk/greenstone2/perllib/util.pm

Timestamp:

2010-07-19T16:00:18+12:00 (14 years ago)

Author:

davidb

Message:

Additional flexibility added in to how get_tmp_filename works with extension value passed in

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -634 +634 @@
     my $file_ext = shift(@_) || undef;
 
-    my $opt_dot_file_ext = (defined $file_ext) ? ".$file_ext" : "";
+    my $opt_dot_file_ext = "";
+    if (defined $file_ext) {
+    if ($file_ext !~ m/\./) {
+        # no dot, so needs one added in at start
+        $opt_dot_file_ext = ".$file_ext"
+    }
+    else {
+        # allow for "extensions" such as _metadata.txt to be handled
+        # gracefully
+        $opt_dot_file_ext = $file_ext;
+    }
+    }
 
     my $tmpdir = filename_cat($ENV{'GSDLHOME'}, "tmp");