Changeset 18404 for gsdl/trunk

Timestamp:

2009-01-16T18:23:59+13:00 (15 years ago)

Author:

ak19

Message:

1. BasePlugin's file_rename_method option changed from inherited to none; 2. unicode::filename_to_url subroutine no longer takes rename_method as a parameter (back to how it was before).

Location:

gsdl/trunk/perllib

Files:

• plugins/BasePlugin.pm (modified) (3 diffs)
• plugins/HTMLPlugin.pm (modified) (1 diff)
• plugins/ImageConverter.pm (modified) (1 diff)
• strings.properties (modified) (1 diff)
• unicode.pm (modified) (1 diff)
• util.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/BasePlugin.pm

@@ -52 +52 @@
       { 'name' => "base64",
     'desc' => "{BasePlugin.rename_method.base64}" }, 
-      { 'name' => "inherited",
-    'desc' => "{BasePlugin.rename_method.inherited}", 
+      { 'name' => "none",
+    'desc' => "{BasePlugin.rename_method.none}", 
     'hiddengli' => "yes" } ];
 
@@ -776 +776 @@
     # If using URL encoding, then SourceFile is the url-reference to url-encoded
     # filemeta: it's a url that refers to the actual file on the system
-    $filemeta = &unicode::filename_to_url($filemeta, $self->{'file_rename_method'});
+    $filemeta = &unicode::filename_to_url($filemeta);
 
     $doc_obj->set_utf8_metadata_element($top_section, "SourceFile", $filemeta);
@@ -1043 +1043 @@
         # If the filename is url_encoded, we need to encode the % signs 
         # in the filename, so that it works in a url
-        my $url_tail_filename = &unicode::filename_to_url($tail_filename, $self->{'file_rename_method'});
+        my $url_tail_filename = &unicode::filename_to_url($tail_filename);
         # work out extended tail extension (i.e. matching tail re)
 

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -1149 +1149 @@
     # of filenames, URL-encode the additional percent signs of the URL-encoded filename
     my $newname_url = $newname;
-    $newname_url = &unicode::filename_to_url($newname_url, $self->{'file_rename_method'});
+    $newname_url = &unicode::filename_to_url($newname_url);
     return "_httpdocimg_/$newname_url"; 
     }

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -188 +188 @@
     # The images that will get generated may contain percent signs in their src filenames
     # Encode those percent signs themselves so that urls to the imgs refer to them correctly 
-    my $url_to_filehead = &unicode::filename_to_url($filehead, $self->{'file_rename_method'});
-    my $url_to_filename_no_path = &unicode::filename_to_url($filename_no_path, $self->{'file_rename_method'});
+    my $url_to_filehead = &unicode::filename_to_url($filehead);
+    my $url_to_filename_no_path = &unicode::filename_to_url($filename_no_path);
     
     # Convert the image to a new type (if required).

gsdl/trunk/perllib/strings.properties

@@ -722 +722 @@
 BasePlugin.rename_method.base64:Use base64 encoding in renaming imported files and associated files.
 
+BasePlugin.rename_method.none:Don't rename imported files and associated files.
+
 BibTexPlugin.desc:BibTexPlugin reads bibliography files in BibTex format. BibTexPlugin creates a document object for every reference in the file. It is a subclass of SplitTextFile, so if there are multiple records, all are read.
 

gsdl/trunk/perllib/unicode.pm

@@ -620 +620 @@
 # a url more than once this way.
 sub filename_to_url {
-    my ($text, $rename_method) = @_;
-    
-    if(!defined $rename_method || $rename_method eq "url") {
-    if($text !~ m/%25/) {
-        $text =~ s/%/%25/g;
-    }
+    my ($text) = @_;
+    
+    if($text !~ m/%25/) {
+    $text =~ s/%/%25/g;
     }
     return $text;

gsdl/trunk/perllib/util.pm

@@ -1026 +1026 @@
     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
     }