X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FResource%2FObject.hs;h=00ebc28e140a622e9d7560e66fb52afc7810adfa;hb=b4a3d2cf3854b10d923cb4c546bf1fe32b021a68;hp=cd2c36463d93f8975db6bf9e9dee26b70ffdb62f;hpb=9681bedbfde02fa1bcda4fbbacba941378c7a57a;p=Rakka.git

diff --git a/Rakka/Resource/Object.hs b/Rakka/Resource/Object.hs
index cd2c364..00ebc28 100644
--- a/Rakka/Resource/Object.hs
+++ b/Rakka/Resource/Object.hs
@@ -37,10 +37,10 @@ handleGet env name
            Nothing
                -> foundNoEntity Nothing
 
-           Just redir@(Redirection _ _ _ _)
+           Just redir@(Redirection _ _ _ _ _)
                -> handleRedirect env redir
 
-           Just entity@(Entity _ _ _ _ _ _ _ _ _ _ _ _ _ _)
+           Just entity@(Entity _ _ _ _ _ _ _ _ _ _ _ _ _ _ _)
                -> handleGetEntity entity
 
 
@@ -62,11 +62,11 @@ handleRedirect env redir
 -}
 handleGetEntity :: Page -> Resource ()
 handleGetEntity page
-    = do case pageRevision page of
-           0   -> foundTimeStamp (pageLastMod page) -- 0 はデフォルトページ
-           rev -> foundEntity (strongETag $ show rev) (pageLastMod page)
+    = do case entityRevision page of
+           0   -> foundTimeStamp (entityLastMod page) -- 0 はデフォルトページ
+           rev -> foundEntity (strongETag $ show rev) (entityLastMod page)
 
-         setContentType (pageType page)
+         setContentType (entityType page)
          setHeader (C8.pack "Content-Disposition")
-                       (C8.pack $ "attachment; filename=" ++ quoteStr (pageFileName' page))
-         outputLBS (pageContent page)
+                       (C8.pack $ "attachment; filename=" ++ quoteStr (entityFileName' page))
+         outputLBS (entityContent page)