Changeset 19623

Timestamp:

2009-05-27T15:13:43+12:00 (14 years ago)

Author:

ak19

Message:

when removing RE syntax, need to change double backslash back to single one

File:

• gsdl/trunk/perllib/plugins/DirectoryPlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/DirectoryPlugin.pm

@@ -408 +408 @@
     $local_dirname =~ s/^$base_dir_regexp($os_dirsep)//;
     $local_dirname .= $dirsep;
-
+    
     if (defined $self->{'subdir_extrametakeys'}->{$local_dirname}) {
     my $extrakeys = $self->{'subdir_extrametakeys'}->{$local_dirname};
@@ -452 +452 @@
     foreach my $ek (@extrametakeys) {
     my ($subdir_re,$extrakey_dir) = &File::Basename::fileparse($ek);
-    $extrakey_dir =~ s/\\\./\./g; # remove RE syntax
+    
+    $extrakey_dir =~ s/\\\./\./g; # remove RE syntax for .
+    $extrakey_dir =~ s/\\\\/\\/g; # remove RE syntax for \
 
     my $dirsep_re = &util::get_re_dirsep();
 
     my $ek_non_re = $ek;
-    $ek_non_re =~ s/\\\./\./g; # remove RE syntax
-
+    $ek_non_re =~ s/\\\./\./g; # remove RE syntax for .
+    $ek_non_re =~ s/\\\\/\\/g; # remove RE syntax for \
     if ($ek_non_re =~ m/$dirsep_re/) { # specifies at least one directory
         my $md = $extrametadata{$ek};
@@ -570 +572 @@
     if ($additionalmetadata == 1) {
         foreach my $filespec (@extrametakeys) {
+        
         ## use the utf8 encoded filename to do the filename comparison
         if ($tmpfile =~ /^$filespec$/) {