Ignore:
Timestamp:
02/08/09 15:09:50 (11 years ago)
Author:
sjamaan
Message:

Merge latest changes in release 4 trunk

Location:
release/3/uri-generic/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/3/uri-generic/trunk

  • release/3/uri-generic/trunk/uri-generic.scm

    r13109 r13212  
    5757         authority-username authority-password
    5858         
    59          absolute-uri uri->string uri->list
    60          uri-relative-to uri-relative-from
     59         absolute-uri absolute-uri? uri->string uri->list
     60         relative-ref? uri-relative-to uri-relative-from
    6161         uri-decode-string uri-encode-string
    6262         uri-normalize-case uri-normalize-path-segments
     
    694694                             fragment: (and uf (uri-char-list->string uf))))))
    695695
     696(define (relative-ref? u)
     697  (and (uri? u) (not (uri-scheme u))))
     698
    696699(define (relative-part s)
    697700  (match s
     
    717720                                  path: (uri-path-list->path up) query: (and uq (uri-char-list->string uq))
    718721                                  fragment: #f)))
    719            (error 'absolute-uri "no scheme found in URI string"))))
     722           (else (error 'absolute-uri "no scheme found in URI string")))))
    720723                     
     724
     725(define (absolute-uri? u)
     726  (and (uri? u) (not (relative-ref? u)) (not (uri-fragment u))))
    721727
    722728;; Turns a URI into a string.
Note: See TracChangeset for help on using the changeset viewer.