Changeset 20413

Timestamp:

2009-08-28T09:57:18+12:00 (15 years ago)

Author:

kjdon

Message:

modifed rename_file to make a bit more efficient when rename_method is none.

File:

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

gsdl/trunk/perllib/util.pm

@@ -1030 +1030 @@
 # Returns the given filename converted using either URL encoding or base64
 # encoding, as specified by $rename_method. If the given filename has no suffix
-# (if it is just the tailname), then $no_suffix should be some defined value. 
+# (if it is just the tailname), then $no_suffix should be some defined value.
+# rename_method can be url, none, base64 
 sub rename_file {
     my ($filename, $rename_method, $no_suffix)  = @_;
@@ -1036 +1037 @@
     if(!$filename) { # undefined or empty string
     return $filename;
+    }
+
+    if (!$rename_method) {
+    print STDERR "WARNING: no file renaming method specified. Defaulting to using URL encoding...\n";
+    # Debugging information
+    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
+    print STDERR "Called from method: $cfilename:$cline $cpackage->$csubr\n";
+    $rename_method = "url";
+    } elsif($rename_method eq "none") {
+    return $filename; # would have already been renamed
     }
 
@@ -1051 +1062 @@
     $suffix = "" if !$suffix;
 
-    if (!$rename_method) {
-    print STDERR "WARNING: no file renaming method specified. Defaulting to using URL encoding...\n";
-    # Debugging information
-    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
-    print STDERR "Calling method: $cfilename:$cline $cpackage->$csubr\n";
-    } elsif($rename_method eq "none") {
-    return $filename; # would have already been renamed
-    }
-
-    if (!$rename_method || $rename_method eq "url") {
+    if ($rename_method eq "url") {
     $tailname = &unicode::url_encode($tailname);
     }