X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=Rakka%2FResource%2FObject.hs;h=cd2c36463d93f8975db6bf9e9dee26b70ffdb62f;hp=a18a268cb3504dc55badca12134cdf5883d02ed7;hb=7a4f13a3d483c950743e1ced001ade4406d239d3;hpb=e0da4e15d6a4053be720bddf62ae755f1f63ec3b diff --git a/Rakka/Resource/Object.hs b/Rakka/Resource/Object.hs index a18a268..cd2c364 100644 --- a/Rakka/Resource/Object.hs +++ b/Rakka/Resource/Object.hs @@ -1,3 +1,4 @@ +-- -*- Coding: utf-8 -*- module Rakka.Resource.Object ( resObject ) @@ -11,7 +12,6 @@ import Rakka.Environment import Rakka.Page import Rakka.Storage import Rakka.SystemConfig -import System.Time resObject :: Environment -> ResourceDef @@ -41,7 +41,7 @@ handleGet env name -> handleRedirect env redir Just entity@(Entity _ _ _ _ _ _ _ _ _ _ _ _ _ _) - -> handleGetEntity env entity + -> handleGetEntity entity {- @@ -60,13 +60,11 @@ handleRedirect env redir ... -} -handleGetEntity :: Environment -> Page -> Resource () -handleGetEntity env page - = do let lastMod = toClockTime $ pageLastMod page - - case pageRevision page of - 0 -> foundTimeStamp lastMod -- 0 はデフォルトページ - rev -> foundEntity (strongETag $ show rev) lastMod +handleGetEntity :: Page -> Resource () +handleGetEntity page + = do case pageRevision page of + 0 -> foundTimeStamp (pageLastMod page) -- 0 はデフォルトページ + rev -> foundEntity (strongETag $ show rev) (pageLastMod page) setContentType (pageType page) setHeader (C8.pack "Content-Disposition")