Changeset 29795 for main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

Timestamp:

2015-03-19T14:08:51+13:00 (9 years ago)

Author:

kjdon

Message:

change to using util method raw_filename_to_unicode. got this working on windows, now have to try again on linux and mac...

File:

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

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

@@ -46 +46 @@
 use Unicode::Normalize;
 
+use Win32;
+
 BEGIN {
     @DirectoryPlugin::ISA = ('PrintInfo');
@@ -410 +412 @@
     }
     @dir = sort readdir (DIR);
-    map { $_ = &unicode::raw_filename_to_url_encoded($_); print STDERR "****$_\n"; } @dir;
+    map {  $_ = &unicode::raw_filename_to_url_encoded($_);  print STDERR "****$_\n"; } @dir;
     closedir (DIR);
-
+    #$_ = &util::get_dirsep_tail(&util::upgrade_if_dos_filename(&FileUtils::filenameConcatenate($dirname, $_), 1));
     # Re-order the files in the list so any directories ending with .all are moved to the end
     for (my $i = scalar(@dir) - 1; $i >= 0; $i--) {
+        #print STDERR "*****file = $dir[$i]\n";
+            #my $long = &Win32::GetLongPathName(&util::filename_cat($dirname,$dir[$i]));
+            #print STDERR "long = $long\n";
+            #my $upgrade = &util::upgrade_if_dos_filename($dir[$i], 1);
+                #print STDERR "upgrade = $upgrade\n";
     if (-d &FileUtils::filenameConcatenate($dirname, $dir[$i]) && $dir[$i] =~ /\.all$/) {
         push(@dir, splice(@dir, $i, 1));
@@ -541 +548 @@
     last if ($maxdocs != -1 && ($count + $total_count) >= $maxdocs);
     next if ($subfile =~ /^\.\.?$/);
-
+     print STDERR "poo poo poo\n";
     my $this_file_base_dir = $base_dir;
     my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile);
-    #my $unicode_subfile = &Encode::decode("utf8", $raw_subfile);
-    my $unicode_subfile = &Encode::decode(locale => $raw_subfile);
-
-    # Normalise the filename to canonical composition - on mac, filenames use decopmposed form for accented chars
-    $unicode_subfile = NFC($unicode_subfile);
+    my $unicode_subfile = &util::raw_filename_to_unicode($dirname, $raw_subfile);
+    print STDERR "raw = $raw_subfile, unicode = $unicode_subfile\n";
 
     my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile);
@@ -558 +562 @@
         next;
     }
-    print STDERR "processing $raw_full_filename\n";
+    print STDERR "** Dir Plugin processing $raw_full_filename\n";
     # Follow Windows shortcuts
     if ($raw_subfile =~ m/(?i)\.lnk$/ && (($ENV{'GSDLOS'} =~ m/^windows$/i) && ($^O ne "cygwin"))) {
@@ -604 +608 @@
        print STDERR "****** subfile = $subfile, raw_subfile = $raw_subfile\n";
     print STDERR &unicode::debug_unicode_string("subfile = $subfile, raw_subfile = $raw_subfile\n");
+    print STDERR "looking up unicode version $unicode_subfile (". &unicode::debug_unicode_string($unicode_subfile).") \n";
     # instead of using the subfile, we need unicode aware string
     ###my $lookup_name = decode("utf8", $raw_subfile);
-    ####print STDERR "lookup nmae = $lookup_name\n";
+    ####print STDERR "lookup nmae = $lookup_name ( \n";
     # Next add metadata read in XML files (if it is supplied)
     if ($additionalmetadata == 1) {
@@ -616 +621 @@
         if ($unicode_subfile =~ /^$filespec$/) {
         ###if ($lookup_name =~ /^$filespec$/) {
-            print $outhandle "File \"$unicode_subfile\" matches filespec \"$filespec\"\n" 
+            print $outhandle "^^^^^^^^^File \"$unicode_subfile\" matches filespec \"$filespec\"\n" 
             if ($verbosity > 2);
             my $mdref = &extrametautil::getmetadata(\%extrametadata, $filespec);