Changeset 31459 for main

Timestamp:

2017-03-06T13:54:36+13:00 (7 years ago)

Author:

kjdon

Message:

now inherits from EncodingUtil. When using local directory in metadata tables, needs to be in perl unicode form, not raw filesystem form.

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (8 diffs)

main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

@@ -31 +31 @@
 
 use extrametautil;
-use PrintInfo;
+use EncodingUtil;
 use plugin;
 use util;
@@ -47 +47 @@
 
 BEGIN {
-    @DirectoryPlugin::ISA = ('PrintInfo');
+    @DirectoryPlugin::ISA = ('EncodingUtil');
 }
 
@@ -81 +81 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new EncodingUtil($pluginlist, $inputargs, $hashArgOptLists);
     
     if ($self->{'info_only'}) {
@@ -395 +395 @@
     }
     
-
     # Recur over directory contents.
     my (@dir, $subfile);
@@ -435 +434 @@
     # but with URL style slashes. 
     my $local_dirname = &util::filename_within_directory_url_format($dirname, $base_dir);
+    ### need it in perl unicode, not raw filesystem
+    my $filename_encoding =  $self->guess_filesystem_encoding();  
+        
+    # copied this from set_Source_metadata in BasePlugin
+    if ((defined $filename_encoding) && ($filename_encoding ne "ascii")) {
+    # Use filename_encoding to map raw filename to a Perl unicode-aware string 
+    $local_dirname = decode($filename_encoding,$local_dirname);     
+    }
+    else {
+    # otherwise generate %xx encoded version of filename for char > 127
+    $local_dirname = &unicode::raw_filename_to_url_encoded($local_dirname);
+    }
 
     # if we are in import folder, then local_dirname will be empty
@@ -451 +462 @@
         }
         delete($self->{'subdir_extrametakeys'}->{$local_dirname});
-    }
+    } 
     }
     # apply metadata pass for each of the files in the directory -- ignore
@@ -487 +498 @@
     
     my ($subdir_re,$extrakey_dir) = &util::url_fileparse($ek);
-    
     if ($extrakey_dir ne "") {
         # a subdir was specified
@@ -555 +565 @@
         next;
     }
-    print STDERR "** DirectoryPlugin processing $raw_full_filename\n";
+
     # Follow Windows shortcuts
     if ($raw_subfile =~ m/(?i)\.lnk$/ && (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin"))) {