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

Timestamp:

2011-11-30T17:48:15+13:00 (12 years ago)

Author:

ak19

Message:

Changes to bat files and perl code to deal with brackets in (Windows) filepath. Also checked winmake.bat files to see if changes were needed there. These changes go together with the commits 24826 to 24828 for gems.bat, and commit 24820 on makegs2.bat.

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (1 diff)

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

@@ -481 +481 @@
     foreach my $ek (@extrametakeys) {
     my ($subdir_re,$extrakey_dir) = &File::Basename::fileparse($ek);
-    $extrakey_dir =~ s/\\\./\./g; # remove RE syntax for .
-    $extrakey_dir =~ s/\\\\/\\/g; # remove RE syntax for \
+    $extrakey_dir = &util::unregex_filename($extrakey_dir);
 
     my $dirsep_re = &util::get_re_dirsep();
 
-    my $ek_non_re = $ek;
-    $ek_non_re =~ s/\\\./\./g; # remove RE syntax for .
-    $ek_non_re =~ s/\\\\/\\/g; # remove RE syntax for \
+    my $ek_non_re = &util::unregex_filename($ek);
     if ($ek_non_re =~ m/$dirsep_re/) { # specifies at least one directory
         my $md = $extrametadata{$ek};