X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=examples%2FHelloWorld.hs;h=dacd4c363604b4694430c6dcf68e91e0ea91d7b9;hb=70bf5bd248aa426ca4e410b3fb9a0529354aedaf;hp=d584009c61cd3f4411836e18f2d0e299741ded70;hpb=175e14b3b144537644e65ca76f1fca5c56fd44e9;p=Lucu.git

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index d584009..dacd4c3 100644
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,23 +1,7 @@
-import Control.Monad.Trans
-import Data.Maybe
-import Network
-import Network.HTTP.Lucu.Config
-import Network.HTTP.Lucu.ETag
-import Network.HTTP.Lucu.Httpd
-import Network.HTTP.Lucu.MIMEType
-import Network.HTTP.Lucu.MIMEType.Guess
-import Network.HTTP.Lucu.Parser
-import Network.HTTP.Lucu.Parser.Http
-import Network.HTTP.Lucu.Resource
-import Network.HTTP.Lucu.Resource.Tree
-import Network.HTTP.Lucu.Response
-import Network.HTTP.Lucu.StaticFile
-import Network.URI
-import System.Posix.Signals
-import System.Time
+import Network.HTTP.Lucu
 
 main :: IO ()
-main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
+main = let config    = defaultConfig { cnfServerPort = "9999" }
            resources = mkResTree [ ( []
                                    , helloWorld )
 
@@ -27,29 +11,30 @@ main = let config    = defaultConfig { cnfServerPort = PortNumber 9999 }
                                  , ( ["inc"]
                                    , staticDir "/usr/include" )
                                  ]
+           fallbacks = [ \ path -> case path of
+                                     ["hello"] -> return $ Just helloWorld
+                                     _         -> return Nothing
+                       ]
        in
-         do installHandler sigPIPE Ignore Nothing
-            runHttpd config resources
+         do putStrLn "Access http://localhost:9999/ with your browser."
+            runHttpd config resources fallbacks
 
 
 helloWorld :: ResourceDef
 helloWorld
-    = ResourceDef {
-        resUsesNativeThread = False
-      , resIsGreedy         = False
-      , resGet
+    = emptyResource {
+        resGet
           = Just $ do --time <- liftIO $ getClockTime
                       --foundEntity (strongETag "abcde") time
-                      setContentType $ "text" </> "hello"
+                      setContentType $ read "text/hello"
                       outputChunk "Hello, "
                       outputChunk "World!\n"
-      , resHead   = Nothing
+                      outputChunk =<< getRemoteAddr'
+                      
       , resPost
           = Just $ do str1 <- inputChunk 3
                       str2 <- inputChunk 3
                       str3 <- inputChunk 3
-                      setContentType $ "text" </> "hello"
+                      setContentType $ read "text/hello"
                       output ("[" ++ str1 ++ " - " ++ str2 ++ "#" ++ str3 ++ "]")
-      , resPut    = Nothing
-      , resDelete = Nothing
       }
\ No newline at end of file