improvements related to page search

[Rakka.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 6621f58a11439ae334923349a75819ff8e042b64..1e670c8df20eb6089ccf731bdb724ab3b102ec81 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -5,10 +5,14 @@ import           Data.Maybe
 import           Network
 import           Network.HTTP.Lucu
 import           Rakka.Environment
+import           Rakka.Resource.CheckAuth
 import           Rakka.Resource.Index
 import           Rakka.Resource.JavaScript
 import           Rakka.Resource.PageEntity
 import           Rakka.Resource.Object
+import           Rakka.Resource.Render
+import           Rakka.Resource.Search
+import           Rakka.Resource.TrackBack
 import           Rakka.Storage
 import           Subversion
 import           System.Console.GetOpt
@@ -22,6 +26,8 @@ import           System.Posix.Files
 import           System.Posix.Types
 import           System.Posix.User
 
+
+logger :: String
 logger = "Main"
 
 
@@ -38,7 +44,7 @@ data CmdOpt
 
 
 defaultPort :: PortNumber
-defaultPort = fromIntegral 8080
+defaultPort = toEnum 8080
 
 defaultLocalStateDir :: FilePath
 defaultLocalStateDir = LOCALSTATEDIR -- replaced by CPP
@@ -56,7 +62,7 @@ defaultLogLevel = NOTICE
 
 options :: [OptDescr CmdOpt]
 options = [ Option ['p'] ["port"]
-                   (ReqArg (OptPortNum . fromIntegral . read) "NUM")
+                   (ReqArg (OptPortNum . toEnum . read) "NUM")
                    ("Port number to listen. (default: " ++ show defaultPort ++ ")")
 
           , Option ['d'] ["localstatedir"]
@@ -133,9 +139,15 @@ main = withSubversion $
           
 resTree :: Environment -> ResTree
 resTree env
-    = mkResTree [ ([]        , resIndex  env)
-                , (["object"], resObject env)
-                , (["js"    ], javaScript   )
+    = mkResTree [ ([]             , resIndex     env)
+                , (["checkAuth"  ], resCheckAuth env)
+                , (["js"         ], javaScript      )
+                , (["object"     ], resObject    env)
+                , (["render"     ], resRender    env)
+                , (["search"     ], resSearch    env)
+                , (["search.html"], resSearch    env)
+                , (["search.xml" ], resSearch    env)
+                , (["trackback"  ], resTrackBack env)
                 ]