Merge lp:~zorba-coders/zorba/file_regex into lp:zorba

[Gabriel Petrovay]

Corrected incorrect regular expressions in the file module.

Corrected incorrect regular expressions in the file module.

[Matthias Brantner (matthias-brantner)]

Is it possible to create a test for this scenario?

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/file_regex-2011-10-17T21-24-01.686Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job file_regex-2011-10-17T21-24-01.686Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/file_regex-2011-10-17T21-48-00.92Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job file_regex-2011-10-17T21-48-00.92Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve.

[Gabriel Petrovay (gabipetrovay)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/file_regex-2011-10-18T19-07-00.313Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job file_regex-2011-10-18T19-07-00.313Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/org/expath/ns/file.xq'
--- modules/org/expath/ns/file.xq	2011-08-17 23:28:19 +0000
+++ modules/org/expath/ns/file.xq	2011-10-17 12:09:26 +0000
@@ -730,20 +730,25 @@
 declare function file:base-name($path as xs:string) as xs:string
 {
   let $delim := file:directory-separator()
+  let $escapedDelim :=
+    if ($delim eq "/") then
+      $delim
+    else
+      fn:concat("\", $delim)
   let $normalized-file := 
     let $n := file:prepare-for-dirname-and-base-name($path)
-		return if ($delim eq "\" and fn:matches($n, "^[a-zA-Z]:$")) then
-			concat($n, "\")
-		else $n
+    return if ($delim eq "\" and fn:matches($n, "^[a-zA-Z]:$")) then
+      fn:concat($n, "\")
+    else $n
   return
-    if (matches($path, concat("^\", $delim, "+$"))) then
+    if (fn:matches($path, fn:concat("^", $escapedDelim, "+$"))) then
       ""
-    else if (file:directory-separator() eq '\' and matches($path, "^[a-zA-Z]:\\?$")) then
+    else if ($delim eq "\" and fn:matches($path, "^[a-zA-Z]:\\?$")) then
       ""
     else if ($path eq "") then
       "."
     else
-      replace($normalized-file, concat("^.*\", $delim), '')
+      fn:replace($normalized-file, fn:concat("^.*", $escapedDelim), "")
 };
 
 (:~
@@ -786,20 +791,25 @@
 declare function file:dir-name($path as xs:string) as xs:string
 {
   let $delim := file:directory-separator()
+  let $escapedDelim :=
+    if ($delim eq "/") then
+      $delim
+    else
+      fn:concat("\", $delim)
   let $normalized-file := file:prepare-for-dirname-and-base-name($path)
   return
-    if (fn:matches($path, concat("^\", $delim, "+$"))) then
+    if (fn:matches($path, fn:concat("^", $escapedDelim, "+$"))) then
       $delim
     else if ($normalized-file eq $delim) then
       $delim
-    else if (file:directory-separator() eq '\' and fn:matches($path, "^[a-zA-Z]:\\$")) then
+    else if ($delim eq "\" and fn:matches($path, "^[a-zA-Z]:\\$")) then
       $path
-    else if (file:directory-separator() eq '\' and fn:matches($normalized-file, "^[a-zA-Z]:$")) then
+    else if ($delim eq "\" and fn:matches($normalized-file, "^[a-zA-Z]:$")) then
       fn:concat($normalized-file, '\')
     else if ($path eq "") then
       "."
-    else if (fn:matches($normalized-file, fn:concat("\", $delim))) then
-      fn:replace($normalized-file, fn:concat('^(.*)\', $delim,'.*'), '$1')
+    else if (fn:matches($normalized-file, $escapedDelim)) then
+      fn:replace($normalized-file, fn:concat("^(.*)", $escapedDelim, ".*"), "$1")
     else
       "."
 };
@@ -812,11 +822,16 @@
 declare %private function file:prepare-for-dirname-and-base-name($path as xs:string) as xs:string
 {
   let $delim := file:directory-separator()
+  let $escapedDelim :=
+    if ($delim eq "/") then
+      $delim
+    else
+      fn:concat("\", $delim)
   let $normalize-path := file:path-to-native($path)
   let $normalized :=
     if ($normalize-path eq $delim) then
       $normalize-path
     else
-      fn:replace($normalize-path, fn:concat("\", $delim, '+$'), '')
+      fn:replace($normalize-path, fn:concat($escapedDelim, "+$"), "")
   return $normalized
 };