Changeset 24829 for main/trunk/greenstone2/perllib/plugouts

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.

Location:

main/trunk/greenstone2/perllib/plugouts

Files:

• BasePlugout.pm (modified) (1 diff)
• DSpacePlugout.pm (modified) (1 diff)
• FedoraMETSPlugout.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -735 +735 @@
 #       if (defined $collect_dir) {
 #       my $collect_dir_re_safe = $collect_dir;
-#       $collect_dir_re_safe =~ s/\\/\\\\/g;
+#       $collect_dir_re_safe =~ s/\\/\\\\/g; # use &util::filename_to_regex()
 #       $collect_dir_re_safe =~ s/\./\\./g;##
 

main/trunk/greenstone2/perllib/plugouts/DSpacePlugout.pm

@@ -300 +300 @@
     $real_filename =~ s/^\\(.*)/$1/i;
     if (-e $real_filename) {
-        # escape backslashes in path for upcoming regex match
-        my $escaped_source_filename = $source_filename;
-        $escaped_source_filename =~ s/\\/\\\\/g;        
+        # escape backslashes and brackets in path for upcoming regex match
+        my $escaped_source_filename = &util::filename_to_regex($source_filename);
         if ($real_filename =~ m/$escaped_source_filename$/) {
         next;

main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.pm

@@ -613 +613 @@
     
     my $gsdl_href = &util::filename_cat($working_dir, $fname);
-    $collectparent =~ s/\\/\\\\/g;             # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
+    $collectparent = &util::filename_to_regex($collectparent); # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
     $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
     $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
@@ -744 +744 @@
 
            my $gsdl_href = &util::filename_cat($working_dir,$assfilePath);
-           $collectparent =~ s/\\/\\\\/g;             # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
+           $collectparent = &util::filename_to_regex($collectparent); # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
            $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
            $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)