Changeset 31491 for main/trunk/greenstone2

Timestamp:

13.03.2017 09:46:17 (3 years ago)

Author:

kjdon

Message:

need to normalize the name when we look up in hte block hash too, for macos

Files:

• main/trunk/greenstone2/perllib/plugins/EncodingUtil.pm (modified) (2 diffs)

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

@@ -32 +32 @@
 
 use encodings;
+use Unicode::Normalize 'normalize';
 
 use PrintInfo;
@@ -639 +640 @@
     }
     }
+    elsif ($ENV{'GSDLOS'} =~ m/^darwin$/) {
+
+    # on mac, we want composed form in the block hash    
+        my $composed_form = normalize('C', $filename_full_path);
+        print STDERR "gsdlos = darwin, composed = ". &unicode::debug_unicode_string($composed_form) ."\n";
+        if (defined $block_hash->{'file_blocks'}->{$composed_form}) {
+            $self->{'num_blocked'} ++;
+            print STDERR "BLOCKED 1\n";
+            return 1;
+        }
+    }
+
     else {
     if (defined $block_hash->{'file_blocks'}->{$filename_full_path}) {