Changeset 24829 for main/trunk/greenstone2/perllib

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

Files:

• inexport.pm (modified) (1 diff)
• plugins/DirectoryPlugin.pm (modified) (1 diff)
• plugouts/BasePlugout.pm (modified) (1 diff)
• plugouts/DSpacePlugout.pm (modified) (1 diff)
• plugouts/FedoraMETSPlugout.pm (modified) (2 diffs)
• strings.properties (modified) (1 diff)
• util.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/inexport.pm

@@ -1035 +1035 @@
 
     $situated_dir =~ s/[\\\/]+$//; # remove tailing slashes
-    $situated_dir =~ s/\\/\\\\/g;  # need to protect windows slash \ in regular expression
+    $situated_dir = &util::filename_to_regex($situated_dir); # need to escape windows slash \ and brackets in regular expression
     
     # Go through existing_files, and mark anything that is contained

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};

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 \)

main/trunk/greenstone2/perllib/strings.properties

@@ -332 +332 @@
 schedule.frequency.daily:Re-build every day
 schedule.frequency.weekly:Re-build every week
+schedule.filepath_warning:**** Warning: schedule.pl may not work when Greenstone is installed in a path containing brackets and/or spaces: %s.
 schedule.action:How to set up automatic re-building
 schedule.action.add:Schedule automatic re-building

main/trunk/greenstone2/perllib/util.pm

@@ -839 +839 @@
     # need to put single backslash back to double so that regex works
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-    $filename =~ s/\\/\\\\/g;
-    }
+        $filename =~ s/\\/\\\\/g;
+    }
+    
+    # note that the first part of a substitution is a regex, so RE chars need to be escaped,
+    # the second part of a substitution is not a regex, so for e.g. full-stop can be specified literally
+    $filename =~ s/\./\\./g; # in case there are extensions/other full stops, escape them
+    $filename =~ s@\(@\\(@g; # escape brackets
+    $filename =~ s@\)@\\)@g; # escape brackets
+    
+    return $filename;
+}
+
+sub unregex_filename {
+    my $filename = shift (@_);
+
+    # 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 "("
+    $filename =~ s@\\\)@)@g; # remove RE syntax for ) => "\)" turns into ")"
     return $filename;
 }
@@ -928 +946 @@
     if ($ENV{'GSDLOS'} =~ /^windows$/i) 
     {
-    my $escaped_val = $val;
-    $escaped_val =~ s/\\/\\\\/g; # escape any Windows backslashes for upcoming regex
+    my $escaped_val = &filename_to_regex($val); # escape any Windows backslashes and brackets for upcoming regex
     if (!defined($ENV{$var})) {
         $ENV{$var} = "$val";
@@ -953 +970 @@
     if ($ENV{'GSDLOS'} =~ /^windows$/i) 
     {
-    my $escaped_val = $val;
-    $escaped_val =~ s/\\/\\\\/g; # escape any Windows backslashes for upcoming regex
+    my $escaped_val = &filename_to_regex($val); # escape any Windows backslashes and brackets for upcoming regex
     if (!defined($ENV{$var})) {
         $ENV{$var} = "$val";
@@ -1048 +1064 @@
     }
     
-    $within_dir =~ s/\\/\\\\/g; # escape DOS style file separator
-
+    $within_dir = &filename_to_regex($within_dir); # escape DOS style file separator and brackets   
     if ($filename =~ m/^$within_dir(.*)$/) {
     $filename = $1;