Changeset 12721 in project

Timestamp:

12/02/08 22:26:59 (12 years ago)

Author:

sjamaan

Message:

Implement collapsing of consecutive slashes and fix a small problem with relative references using dot-dot on URIs that end with slashes

Location:

release/4/uri-generic/trunk

Files:

• tests/run.scm (modified) (1 diff)
• uri-generic.scm (modified) (2 diffs)

release/4/uri-generic/trunk/tests/run.scm

@@ -102 +102 @@
     (,base "http:" "http:")
     (,base "..%2f" "http://a/b/c/..%2f")
+    ("http://a/b/c/d/" ".." "http://a/b/c/")
+    ("http://a/b/c/d/" "../e" "http://a/b/c/e")
+    ("http://a/b/c/d/" "../e/" "http://a/b/c/e/")
+    ("http://a/b//c///d///" "..//.." "http://a/b/")
     ))
 

release/4/uri-generic/trunk/uri-generic.scm

@@ -557 +557 @@
 (define (slash-segment s)
   (match s
-         ((#\/ . rst)  (match (segment rst)
-                              ((ss rst)  (list (cons #\/ ss) rst))
-                              (else #f)))
+         ((#\/ . rst)
+          (or (slash-segment rst)
+              (match (segment rst)
+                     ((ss rst)  (list (cons #\/ ss) rst))
+                     (else #f))))
          (else  #f)))
 
@@ -859 +861 @@
 (define (merge0 pb pr)
   (let* ((rpb  (reverse pb))
-         (pb1  (reverse (if (and (pair? rpb) (not (string=? (car rpb) "/"))) (cdr rpb) rpb)))
+         (pb1  (reverse (if (pair? rpb) (cdr rpb) rpb)))
          (pr1  (or (and (pair? pr) (not (string=? ".." (car pr))) (not (string=? "." (car pr)))
-                        (not (string-prefix? "/" (car pr))) 
+                        (not (string-prefix? "/" (car pr)))
                         (cons (string-append "/" (car pr)) (cdr pr)))
                    pr)))