Added option to strip querystring from requrl.

[wrw.git] / wrw / resp.py
diff --git a/wrw/resp.py b/wrw/resp.py

index 6e95ec5..965df6c 100644 (file)
--- a/wrw/resp.py
+++ b/wrw/resp.py
@@ -1,31 +1,21 @@
  from . import dispatch, proto, env
+from .sp import xhtml
+h = xhtml.cons()
  
  __all__ = ["skeleton", "skelfor", "setskel", "usererror"]
  
  class skeleton(object):
-    def page(self, title, content):
-        return """<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
-<head>
-%s
-</head>
-<body>
-%s
-</body>
-</html>""" % (self.head(title), content)
-
-    def head(self, title):
-        return """<title>%s</title>\n%s""" % (title, self.style())
-
-    def style(self):
-        return ""
-
-    def error(self, message, detail):
-        return self.page(message, """<h1>%s</h1>\n<p>%s</p>\n""" % (message, detail))
-
-    def message(self, message, detail):
-        return self.page(message, """<h1>%s</h1>\n<p>%s</p>\n""" % (message, detail))
+    def page(self, req, title, *content):
+        return xhtml.forreq(req, h.html(self.head(req, title), h.body(*content)))
+
+    def head(self, req, title):
+        return xhtml.head(title=title)
+
+    def error(self, req, message, *detail):
+        return self.page(req, message, h.h1(message), h.p(*detail))
+
+    def message(self, req, message, *detail):
+        return self.page(req, message, h.h1(message), h.p(*detail))
  
  defskel = env.var(skeleton())
  
@@ -37,30 +27,30 @@ def setskel(req, skel):
      req.item(getskel)[0] = skel
  
  class usererror(dispatch.restart):
-    def __init__(self, message, detail):
+    def __init__(self, message, *detail):
          super().__init__()
          self.message = message
          self.detail = detail
  
      def handle(self, req):
-        return [skelfor(req).error(self.message, self.detail)]
+        return skelfor(req).error(req, self.message, *self.detail)
  
  class message(dispatch.restart):
-    def __init__(self, message, detail):
+    def __init__(self, message, *detail):
          super().__init__()
          self.message = message
          self.detail = detail
  
      def handle(self, req):
-        return [skelfor(req).message(self.message, self.detail)]
+        return skelfor(req).message(req, self.message, *self.detail)
  
  class httperror(usererror):
-    def __init__(self, status, message = None, detail = None):
+    def __init__(self, status, message=None, detail=None):
          if message is None:
              message = proto.statusinfo[status][0]
          if detail is None:
-            detail = proto.statusinfo[status][1]
-        super().__init__(message, detail)
+            detail = (proto.statusinfo[status][1],)
+        super().__init__(message, *detail)
          self.status = status
  
      def handle(self, req):
@@ -72,12 +62,25 @@ class notfound(httperror):
          return super().__init__(404)
  
  class redirect(dispatch.restart):
-    def __init__(self, url, status = 303):
+    bases = {"url": proto.requrl,
+             "script": proto.scripturl,
+             "site": proto.siteurl}
+
+    def __init__(self, url, status=303, base="url"):
          super().__init__()
          self.url = url
          self.status = status
+        self.bases[base]
+        self.base = base
  
      def handle(self, req):
          req.status(self.status, "Redirect")
-        req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url)
+        req.ohead["Location"] = proto.appendurl(self.bases[self.base](req), self.url)
+        req.ohead["Content-Length"] = 0
+        return []
+
+class unmodified(dispatch.restart):
+    def handle(self, req):
+        req.status(304, "Not Modified")
+        req.ohead["Content-Length"] = "0"
          return []