diff options
author | Vincent Ambo <v.ambo@me.com> | 2012-03-18T22·49+0100 |
---|---|---|
committer | Vincent Ambo <v.ambo@me.com> | 2012-03-18T22·49+0100 |
commit | da388782122779e865fc5454e5182d95c7f8fa26 (patch) | |
tree | 15d02dbbdba7bda258fa2f9a690ec049803ceff1 /src/Main.hs | |
parent | 515660fa7deeeb6753768378e0cfa38a4616e03a (diff) |
* correctly serving 404s with status code 404 :|
Diffstat (limited to 'src/Main.hs')
-rw-r--r-- | src/Main.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Main.hs b/src/Main.hs index f12c74349414..ce423f932d9f 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -74,7 +74,7 @@ tazBlog acid = , dir "admin" $ ok $ toResponse $ adminLogin , dir "dologin" $ processLogin acid , serveDirectory DisableBrowsing [] "../res" - , ok $ toResponse $ showError NotFound DE + , notFound $ toResponse $ showError NotFound DE ] blogHandler :: AcidState Blog -> BlogLang -> ServerPart Response @@ -85,7 +85,7 @@ blogHandler acid lang = \(eId :: Integer) -> addComment acid lang $ EntryId eId , do nullDir showIndex acid lang - , ok $ toResponse $ showError NotFound lang + , notFound $ toResponse $ showError NotFound lang ] formatOldLink :: Int -> Int -> String -> ServerPart Response @@ -96,11 +96,11 @@ formatOldLink y m id_ = showEntry :: AcidState Blog -> BlogLang -> EntryId -> ServerPart Response showEntry acid lang eId = do entry <- query' acid (GetEntry eId) - ok $ tryEntry entry lang + tryEntry entry lang -tryEntry :: Maybe Entry -> BlogLang -> Response -tryEntry Nothing lang = toResponse $ showError NotFound lang -tryEntry (Just entry) _ = toResponse $ blogTemplate eLang eTitle $ renderEntry entry +tryEntry :: Maybe Entry -> BlogLang -> ServerPart Response +tryEntry Nothing lang = notFound $ toResponse $ showError NotFound lang +tryEntry (Just entry) _ = ok $ toResponse $ blogTemplate eLang eTitle $ renderEntry entry where eTitle = T.append ": " (title entry) eLang = lang entry |