Removing utils.ss

svn: r6441

collects/web-server/prototype-web-server/dispatch-lang.ss

@@ -1,5 +1,6 @@
 (module dispatch-lang mzscheme
   (require (lib "kw.ss")
+           (lib "list.ss")
            (lib "contract.ss")
            (lib "url.ss" "net")
            (lib "session.ss" "web-server" "prototype-web-server" "private")
@@ -12,8 +13,7 @@
            "../private/util.ss"
            "../private/response.ss"
            "../configuration/namespace.ss"
-           "../configuration/responders.ss"
+           "../configuration/responders.ss")
-           "private/utils.ss")
   
   (provide/contract
    [interface-version dispatcher-interface-version?])
@@ -21,6 +21,32 @@
   
   (define top-cust (current-custodian))
   
+  ; same-servlet? : url? url? -> boolean?
+  (define (same-servlet? req ses)
+    (define (abstract-url u)
+      (map path/param-path
+           (url-path u)))
+    (define ans (list-prefix (abstract-url ses) (abstract-url req)))
+    #;(printf "~S => ~S~n" `(same-servlet? ,(url->string req) ,(url->string ses)) ans)
+    (and ans #t))
+  
+  ;; make-session-url: url (listof string) -> url
+  ;; produce a new url for this session:
+  ;;   Minimal path to the servlet.
+  ;;   No query.
+  ;;   No fragment.
+  (define (make-session-url uri new-path)
+    (make-url
+     (url-scheme uri)
+     (url-user uri)
+     (url-host uri)
+     (url-port uri)
+     #t
+     (map (lambda (p) (make-path/param p empty))
+          new-path)
+     empty
+     #f))
+  
   (define interface-version 'v1)
   (define/kw (make #:key
                    url->path
@@ -76,15 +102,6 @@
             (resume-session (session-id ses)
                             conn req)))))       
     
-    ; same-servlet? : url? url? -> boolean?
-    (define (same-servlet? req ses)
-      (define (abstract-url u)
-        (map path/param-path
-             (url-path u)))
-      (define ans (list-prefix (abstract-url ses) (abstract-url req)))
-      #;(printf "~S => ~S~n" `(same-servlet? ,(url->string req) ,(url->string ses)) ans)
-      (and ans #t))
-    
     ;; resume-session: number connection request
     (define (resume-session ses-id conn req)
       (cond

collects/web-server/prototype-web-server/lang/stuff-url.ss

@@ -2,7 +2,7 @@
   (require (lib "contract.ss")
            (lib "url.ss" "net")
            (lib "serialize.ss")
-           "../private/utils.ss"
+           "../../private/util.ss"
            "../private/url-param.ss"
            "../private/mod-map.ss")
   

collects/web-server/prototype-web-server/private/url-param.ss

@@ -3,7 +3,6 @@
            (lib "url.ss" "net")
            (lib "plt-match.ss")
            (lib "list.ss")
-           "utils.ss"
            "../../private/util.ss")
   
   (provide/contract

collects/web-server/prototype-web-server/private/utils.ss

@@ -1,35 +0,0 @@
-(module utils mzscheme
-  (require (lib "contract.ss")
-           (lib "url.ss" "net")
-           (lib "list.ss")
-           (lib "serialize.ss"))
-  
-  (provide/contract
-   [read/string (string? . -> . serializable?)]
-   [write/string (serializable? . -> . string?)]
-   [make-session-url (url? (listof string?) . -> . url?)])
-    
-  (define (read/string str)
-    (read (open-input-string str)))
-  (define (write/string v)
-    (define str (open-output-string))
-    (write v str)
-    (get-output-string str))
-  
-  ;; make-session-url: url (listof string) -> url
-  ;; produce a new url for this session:
-  ;;   Minimal path to the servlet.
-  ;;   No query.
-  ;;   No fragment.
-  (define (make-session-url uri new-path)
-    (make-url
-     (url-scheme uri)
-     (url-user uri)
-     (url-host uri)
-     (url-port uri)
-     #t
-     (map (lambda (p) (make-path/param p empty))
-          new-path)
-     '()
-     #f
-     )))