From 8faa0e7d8b55cb199b5c5ffb526e386afef1731b Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 23 Feb 2014 17:30:26 +0000
Subject: [PATCH] mason/dhandler: Bring not-found handling into the dhandler.

This means we get the HTML skeleton correctly, and can kill the separate
`%not-found' component.
---
 mason/%not-found | 12 ------------
 mason/dhandler   | 27 ++++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 mason/%not-found

diff --git a/mason/%not-found b/mason/%not-found
deleted file mode 100644
index 9ba24d8..0000000
--- a/mason/%not-found
+++ /dev/null
@@ -1,12 +0,0 @@
-<%method title>Not found</%method>
-<h1>Not found</h1>
-Failed to find &lsquo;<code><% $what |h %></code>&rsquo;.
-% $m->abort(404);
-
-<%flags>
-inherit => ".html"
-</%flags>
-
-<%args>
-$what
-</%args>
diff --git a/mason/dhandler b/mason/dhandler
index d7c1da5..59d5e3e 100755
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -41,15 +41,32 @@
 	$nrow => 4
 </%args>
 %#
-<%method title>Single hand</%method>
+<%method title>\
+% if ($fail) {
+Not found\
+% } else {
+Single hand\
+% }
+</%method>
+%#
+<%def .not-found>
+<h1>Not found</h1>
+Failed to find &lsquo;<code><% $what |h %></code>&rsquo;.
+% return 404;
+<%args>
+	$what
+</%args>
+</%def>
 %#
 <%once>
 	use Deal;
 </%once>
 %#
+<%shared>
+	my $fail = ($m->dhandler_arg ne "");
+</%shared>
+%#
 <%init>
-	unless ($m->dhandler_arg eq "") {
-	  $m->clear_buffer;
-	  $m->comp("%not-found", what => $m->dhandler_arg);
-	}
+	return $m->comp(".not-found", what => $m->dhandler_arg)
+	  if $fail;
 </%init>
-- 
2.11.0