Changeset 25093

Timestamp:

2012-02-16T15:06:36+13:00 (12 years ago)

Author:

kjdon

Message:

added filepath_regex_to_url_format method. like filepath_to_url_format, but assumes already a regex, so need to look for \ not \ for windows dirsep. added url_fileparse which splits into leading dirs and final filename. like File::Basename::fileparse, but assumes url style, ie always / for dirsep

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1100 +1100 @@
 }
 
+# regex filepaths on windows may include \\ as path separator. Convert \\ to /
+sub filepath_regex_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;
+    
+}
+
+# Like File::Basename::fileparse, but expects filepath in url format (ie only / slash for dirsep)
+# and ignores trailing /
+# returns (file, dirs) dirs will be empty if no subdirs
+sub url_fileparse
+{
+    my ($filepath) = @_;
+    # remove trailing /
+    $filepath =~ s@/$@@;
+    if ($filepath !~ m@/@) {
+    return ($filepath, "");
+    } 
+    my ($dirs, $file) = $filepath =~ m@(.+/)([^/]+)@;
+    return ($file, $dirs);
+    
+}
+
 
 sub filename_within_collection