From 6f56232153b822f563ca0d46f021b030263d52b4 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Fri, 17 Jan 2014 00:08:52 -0800 Subject: [PATCH] updates --- {foobar => pollen-server-extras}/poldash.css | 0 server.rkt | 15 ++++++++------- test-include.rkt | 3 +++ 3 files changed, 11 insertions(+), 7 deletions(-) rename {foobar => pollen-server-extras}/poldash.css (100%) create mode 100644 test-include.rkt diff --git a/foobar/poldash.css b/pollen-server-extras/poldash.css similarity index 100% rename from foobar/poldash.css rename to pollen-server-extras/poldash.css diff --git a/server.rkt b/server.rkt index f65cd06..8ad7b20 100755 --- a/server.rkt +++ b/server.rkt @@ -1,9 +1,7 @@ #lang web-server (require "startup.rkt") -(require web-server/servlet-env) -(require web-server/dispatch web-server/dispatchers/dispatch) -(require xml) -(require "server-routes.rkt" "debug.rkt" "readability.rkt" "world.rkt") +(require web-server/servlet-env web-server/dispatch web-server/dispatchers/dispatch xml) +(require "server-routes.rkt" "debug.rkt" "world.rkt") (define port-number 8088) @@ -34,7 +32,7 @@ ;; (pattern matcher automatically takes out the "raw") [((string-arg) ... "raw" (string-arg)) (route-wrapper route-raw)] [((string-arg) ... "xexpr" (string-arg)) (route-wrapper route-xexpr)] -;; [((string-arg) ... "force" (string-arg)) (route-wrapper route-force)] + ; [((string-arg) ... "force" (string-arg)) (route-wrapper route-force)] [else (λ(req) ;; because it's the "else" route, can't use string-arg matcher (logger req) @@ -44,10 +42,13 @@ (message (format "Project dashboard is http://localhost:~a/pollen.html" port-number)) (message "Ready to rock") - (serve/servlet start #:port port-number #:listen-ip #f #:servlet-regexp #rx"" ; respond to top level #:command-line? #t - #:extra-files-paths (list (build-path PROJECT_ROOT))) \ No newline at end of file + #:extra-files-paths (list + ;; todo: use a function to determine directory + (build-path "/Users/mb/git/pollen/" "pollen-server-extras") + ;; for serving static files out of project directory + (build-path PROJECT_ROOT))) \ No newline at end of file diff --git a/test-include.rkt b/test-include.rkt new file mode 100644 index 0000000..ee61a9d --- /dev/null +++ b/test-include.rkt @@ -0,0 +1,3 @@ +#lang racket + +(include "poldash.css") \ No newline at end of file