Changeset 24971 for main/trunk/greenstone2/perllib/util.pm

Timestamp:

2012-01-24T16:19:58+13:00 (12 years ago)

Author:

ak19

Message:

1. Introduced the util::filepath_to_url_format subroutine which will be used to convert filenames to URL style filenames to match the slashes used in the filename regex-es in extrameta keys used to index into extrameta data structures. 2. Fixed bug on windows where metadata.xml specifies filenames as regex with backslash in front of the file extension's period mark: DirectoryPlugin needed to unregex the filepath before calling fileparse on it, else the escaping backslash would interfere with perl's fileparse routine (only on windows, since backslash also represents a dirsep here). 3. Updated all those perl plugins where the new util::filepath_to_url_format needs to be called so that they use URL style filenames (thereafter regexed) to index into the extrameta data structures.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -837 +837 @@
     my $filename = shift (@_);
 
-    # need to put single backslash back to double so that regex works
+    # need to make single backslashes double so that regex works
     $filename =~ s/\\/\\\\/g; # if ($ENV{'GSDLOS'} =~ /^windows$/i);    
     
@@ -1067 +1067 @@
     # convert parameters only to / slashes if Windows
     
-    my $filename_urlformat = $filename;
-    my $within_dir_urlformat = $within_dir;
-    
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-        # Only need to worry about Windows, as Unix style directories already in url-format
-        # Convert Windows style \ => /
-        $filename_urlformat =~ s@\\@/@g;
-        $within_dir_urlformat =~ s@\\@/@g;
-    }
-    
+    my $filename_urlformat = &filepath_to_url_format($filename);
+    my $within_dir_urlformat = &filepath_to_url_format($within_dir);
+
     #if ($within_dir_urlformat !~ m/\/$/) {
         # make sure directory ends with a slash
@@ -1092 +1085 @@
     
     return $filename_urlformat;
+}
+
+# Convert parameter to use / slashes if Windows (if on Linux leave any \ as is,
+# since on Linux it doesn't represent a file separator but an escape char).
+sub filepath_to_url_format
+{
+    my ($filepath) = @_;
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+        # Only need to worry about Windows, as Unix style directories already in url-format
+        # Convert Windows style \ => /
+        $filepath =~ s@\\@/@g;      
+    }
+    return $filepath;
 }