Changeset 24940

Timestamp:

2012-01-11T14:27:20+13:00 (11 years ago)

Author:

ak19

Message:

Dr Bainbridge discovered a logic error in the order of steps in unregex_filename. These steps should be in reverse order of filename_to_regex.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -855 +855 @@
 
     # need to put doubled backslashes for regex back to single
-    $filename =~ s/\\\\/\\/g; # remove RE syntax for \    
     $filename =~ s/\\\./\./g; # remove RE syntax for .
     $filename =~ s@\\\(@(@g; # remove RE syntax for ( => "\(" turns into "("
@@ -861 +860 @@
     $filename =~ s@\\\[@[@g; # remove RE syntax for [ => "\[" turns into "["
     $filename =~ s@\\\]@]@g; # remove RE syntax for ] => "\]" turns into "]"
+    
+    # \\ goes to \
+    # This is the last step in reverse mirroring the order of steps in filename_to_regex()
+    $filename =~ s/\\\\/\\/g; # remove RE syntax for \    
     return $filename;
 }