Changeset 15224 in project

Timestamp:

07/15/09 21:34:07 (10 years ago)

Author:

certainty

Message:

fixed bug. the full path is now passed to dispatch-error

File:

• release/4/uri-dispatch/trunk/uri-dispatch.scm (modified) (2 diffs)

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

@@ -8 +8 @@
 ;; Version: $Id$
 ;; Version: 
-;; Last-Updated: Mi Jul 15 21:34:53 2009 (CEST)
+;; Last-Updated: Mi Jul 15 21:49:20 2009 (CEST)
 ;;           By: David Krentzlin <david@lisp-unleashed.de>
-;;     Update #: 91
+;;     Update #: 96
 ;; URL: 
 ;; Keywords: 
@@ -84 +84 @@
         (if (equal? (car path) "")
             (apply (or (default-dispatch-target) (dispatch-error)) '())
-            (apply (or (handler-ref (string->symbol (car path)))
-                       (dispatch-error))
-                   (cdr path))))
+            (let ((handler (handler-ref (string->symbol (car path)))))
+              (if handler
+                  (handler (cdr path)))
+                  (apply (dispatch-error) path))))
        (else
         (let ((mod/proc (handler-ref (string->symbol (string-append (car path) "#" (cadr path))) (string->symbol (car path)))))
           (if mod/proc
               (apply mod/proc (cddr path))
-              (apply (or (handler-ref (string->symbol (car path)))
-                         (dispatch-error))
-                     (cdr path))))))))
+              (let ((handler (handler-ref (string->symbol (car path)))))
+                (if handler
+                    (handler (cdr path))
+                    (apply (dispatch-error) path)))))))))
 
   (define (handler-ref symbol #!optional (mod #f))