Changeset 18398 for gsdl/trunk

Timestamp:

2009-01-15T19:25:27+13:00 (15 years ago)

Author:

ak19

Message:

1. Added the file_rename_method option Inherited, so that secondary plugins use the same file_rename_method that's set for the primary plugin. 2. New subroutine get_file_rename_method that returns the current stored rename method (to be used in perl scripts, such as explode_metadata_database). 3. Call to unicode::filename_to_url is now passed the file_rename_method so that nothing is done if we're base64 encoding.

File:

• gsdl/trunk/perllib/plugins/BasePlugin.pm (modified) (4 diffs)

gsdl/trunk/perllib/plugins/BasePlugin.pm

@@ -51 +51 @@
     'desc' => "{BasePlugin.rename_method.url}" },
       { 'name' => "base64",
-    'desc' => "{BasePlugin.rename_method.base64}" } ];
+    'desc' => "{BasePlugin.rename_method.base64}" }, 
+      { 'name' => "inherited",
+    'desc' => "{BasePlugin.rename_method.inherited}", 
+    'hiddengli' => "yes" } ];
 
 our $encoding_list =
@@ -367 +370 @@
 }
 
+# returns this plugin's active (possibly user-selected) file_rename_method
+sub get_file_rename_method() {
+    my $self = shift (@_);
+    my $rename_method = $self->{'file_rename_method'};
+    if($rename_method) {
+    return $rename_method;
+    } else {    
+    return $self->get_default_file_rename_method();
+    }
+}
+
 # default implementation is to do nothing
 sub store_block_files {
@@ -740 +754 @@
     if ($@) {
     print $outhandle "$@\n";
-    print $outhandle "Warning: Unable to establish locale.  Will assume filesytem is UTF-8\n";
+    print $outhandle "Warning: Unable to establish locale.  Will assume filesystem is UTF-8\n";
     
     }
@@ -1029 +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);
+        my $url_tail_filename = &unicode::filename_to_url($tail_filename, $self->{'file_rename_method'});
         # work out extended tail extension (i.e. matching tail re)