Changeset 24829 for main/trunk/greenstone2/bin

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/bin/script

Files:

• explode_metadata_database.pl (modified) (2 diffs)
• schedule.pl (modified) (1 diff)
• wvware.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/explode_metadata_database.pl

@@ -412 +412 @@
         my ($field, $value) = (@$pair);
         $field =~ s/^ex\.([^.]+)$/$1/; #remove any ex. iff it's the only metadata set prefix (will leave ex.dc.* intact)
-        $value =~ s/\\\\/\\/g;
+        $value =~ s/\\\\/\\/g;         # don't regex brackets () here though!
         my $document_file_full;
 
@@ -596 +596 @@
     }
     else {
-        $orig_base_dir =~ s/\\/\\\\/g; # escape windows style slashes for the regex below
+        $orig_base_dir = &util::filename_to_regex($orig_base_dir); # escape windows style slashes for the regex below       
         if ($document_file_full =~ m/^$orig_base_dir.*/) {
         # file local to metadata record

main/trunk/greenstone2/bin/script/schedule.pl

@@ -208 +208 @@
     $os = $ENV{'GSDLOS'};
     $path = $ENV{'PATH'}; 
+    
+    if("$gsdl" =~ m/(\\\(|\\\)| )/ ) { # () brackets or spaces in path
+        &gsprintf($out, "\n\n{schedule.filepath_warning}\n\n\n", $gsdl);
+    }
 
     my $service = "schedule"; 

main/trunk/greenstone2/bin/script/wvware.pl

@@ -333 +333 @@
     my $safe_reg_expression = $assoc_dir_path;
     $safe_reg_expression =~ s/\\/\\\\/g;
+    $safe_reg_expression =~ s@\(@\\(@g; # escape brackets
+    $safe_reg_expression =~ s@\)@\\)@g; # escape brackets
     $safe_reg_expression =~ s/\./\\./g;
     $safe_reg_expression =~ s/\-/\\-/g;