Changeset 1159 for lang/haskell

Timestamp:

11/06/07 00:51:28 (6 years ago)

Author:

jknaoya

Message:

lang/haskell/blosxkel/config.sample,
lang/haskell/blosxkel/blosxkel.hs:

config をよむようにしました

Location:

lang/haskell/blosxkel

Files:

• . (modified) (1 prop)
• blosxkel.hs (modified) (4 diffs)
• config.sample (added)

lang/haskell/blosxkel

@@ -3 +3 @@
 blosxkel.o
 blosxkel.cgi
+config

@@ -3 +3 @@
 blosxkel.o
 blosxkel.cgi
+config

lang/haskell/blosxkel/blosxkel.hs

@@ -31 +31 @@
         expand var = fromMaybe ('$':var) (lookup var params)
 
+loadConfig :: String -> IO [(String, String)]
+loadConfig config = do
+    {
+    ; c <- readFile config
+    ; return $ concatMap parseLine $ lines c
+    } where
+        parseLine :: String -> [(String, String)]
+        parseLine l
+                  | all isSpace l = []
+                  | otherwise = let (k, (':':v)) = (break (== ':') l)
+                                in [(strip k, strip v)]
+        strip     = rstrip . lstrip
+        rstrip    = reverse . lstrip . reverse
+        lstrip    = dropWhile isSpace
+
+getConfig :: [(String, String)] -> String -> String
+getConfig config key = fromJust $ lookup key config
 
 data Entry = Entry {
@@ -78 +95 @@
 
 
-getResult :: [(String, String)] -> IO (String, String)
-getResult cgiparams = do
+getResult :: [(String, String)] -> [(String, String)] -> IO (String, String)
+getResult cgiparams config = do
     {
-    ; entries <- getTextFileEntries "data"
+    ; entries <- getTextFileEntries $ getConfig config "data-dir"
     ; ct <- fill "content_type" []
     ; ch <- fill "head" []
@@ -94 +111 @@
     ; return $ (ct, concat $ [ch, concat cs, cf])
     } where
-        fill place params = fillFlavour "html" place (params ++ [("title", "Blosxkel.hs"),
+        fill place params = fillFlavour "html" place (params ++ [("title", getConfig config "title"),
+                                                                 ("author", getConfig config "author"),
                                                                  ("version", "aaa")] ++ cgiparams)
 
@@ -100 +118 @@
 cgiMain =  do
     {
+    ; config  <- liftIO $ loadConfig "config"
     ; home <- scriptName
     ; pathinfo <- pathInfo
-    ; result <- liftIO $ getResult [("home", home), ("pathinfo", pathinfo)]
-    ; setHeader "Content-Type" $ fst result
-    ; output $ snd result
+    ; (ct, cb)  <- liftIO $ getResult [("home", home), ("pathinfo", pathinfo)] config
+    ; setHeader "Content-Type" $ ct
+    ; output $ cb
     }
 

@@ -3 +3 @@
 blosxkel.o
 blosxkel.cgi
+config