X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FResource%2FObject.hs;h=5f5b5c51625c97c6e7524ec8336ca05f379c0432;hb=fcddebcc3cc02ae8d1904b9338334d538019e74a;hp=af0d9b7604da54602e89e7d6ef4e25a749947c48;hpb=885faf1cabc3f79c90e1885268e2a9138b1ddefb;p=Rakka.git

diff --git a/Rakka/Resource/Object.hs b/Rakka/Resource/Object.hs
index af0d9b7..5f5b5c5 100644
--- a/Rakka/Resource/Object.hs
+++ b/Rakka/Resource/Object.hs
@@ -1,3 +1,4 @@
+-- -*- Coding: utf-8 -*-
 module Rakka.Resource.Object
     ( resObject
     )
@@ -9,8 +10,6 @@ import           Rakka.Environment
 import           Rakka.Page
 import           Rakka.Storage
 import           Rakka.SystemConfig
-import           System.FilePath
-import           System.Time
 
 
 resObject :: Environment -> ResourceDef
@@ -26,21 +25,18 @@ resObject env
       }
     where
       toPageName :: [String] -> PageName
-      toPageName = decodePageName . dropExtension . joinWith "/" 
+      toPageName = decodePageName . joinWith "/" 
 
 
 handleGet :: Environment -> PageName -> Resource ()
 handleGet env name
-    = do pageM <- getPage (envStorage env) name
+    = do pageM <- getPage (envStorage env) name Nothing
          case pageM of
-           Nothing
-               -> foundNoEntity Nothing
-
-           Just redir@(Redirection _ _ _ _)
-               -> handleRedirect env redir
-
-           Just entity@(Entity _ _ _ _ _ _ _ _ _ _ _ _)
-               -> handleGetEntity env entity
+           Nothing   -> foundNoEntity Nothing
+           Just page -> if isEntity page then
+                            handleGetEntity page
+                        else
+                            handleRedirect env page
 
 
 {-
@@ -49,7 +45,7 @@ handleGet env name
 -}
 handleRedirect :: Environment -> Page -> Resource ()
 handleRedirect env redir
-    = do BaseURI baseURI <- getSysConf (envSysConf env) (BaseURI undefined)
+    = do BaseURI baseURI <- getSysConf (envSysConf env)
          redirect Found (mkObjectURI baseURI $ redirName redir)
 
 
@@ -59,13 +55,11 @@ handleRedirect env redir
   
   ...
 -}
-handleGetEntity :: Environment -> Page -> Resource ()
-handleGetEntity env page
-    = do let lastMod = toClockTime $ pageLastMod page
-
-         case pageRevision page of
-           Nothing  -> foundTimeStamp lastMod
-           Just rev -> foundEntity (strongETag $ show rev) lastMod
+handleGetEntity :: Page -> Resource ()
+handleGetEntity page
+    = do case entityRevision page of
+           0   -> foundTimeStamp (entityLastMod page) -- 0 はデフォルトページ
+           rev -> foundEntity (strongETag $ show rev) (entityLastMod page)
 
-         setContentType (pageType    page)
-         outputLBS      (pageContent page)
+         setContentType (entityType page)
+         outputLBS (entityContent page)