More cleanup...

diegoeche · Dec 27, 2008 · 1a1e99e · 1a1e99e
1 parent e3c988f
commit 1a1e99e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Turbinado/Environment/Types.hs b/Turbinado/Environment/Types.hs
@@ -63,7 +63,7 @@ data CodeStore  = CodeStore (MVar CodeMap)
 type CodeMap    = M.Map CodeLocation CodeStatus
 data CodeStatus = CodeLoadMissing |
                   CodeLoadFailure String |
-                  CodeLoadController (StateT Environment IO ()) Module CodeDate |
+                  CodeLoadController          (StateT Environment IO ())                 Module CodeDate |
                   CodeLoadView                (XMLGenT (StateT Environment IO) XML     ) Module CodeDate |
                   CodeLoadComponentController (StateT Environment IO ())                 Module CodeDate |
                   CodeLoadComponentView       (XMLGenT (StateT Environment IO) XML     ) Module CodeDate

diff --git a/Turbinado/Server.hs b/Turbinado/Server.hs
@@ -68,7 +68,7 @@ startServer pnr
     = withSocketsDo $ 
       do e <- runController 
                (sequence_ $ [ addLoggerToEnvironment
-                                       , addCodeStoreToEnvironment
+                            , addCodeStoreToEnvironment
                             , addMimeTypesToEnvironment "Config/mime.types"]
                             ++ customSetupFilters
                ) 

diff --git a/Turbinado/View.hs b/Turbinado/View.hs
@@ -60,6 +60,25 @@ evalView p = do e <- getEnvironment
 defaultContentType :: String
 defaultContentType = "text/html; charset=ISO-8859-1"
 
+insertDefaultView :: View XML
+insertDefaultView = 
+             do cl <- getView
+                debugM $ "    Layout: insertDefaultView : loading   " ++ (fst cl) ++ " - " ++ (snd cl)
+                c <- retrieveCode CTView cl
+                case c of
+                  CodeLoadView       v _ _ -> v 
+                  CodeLoadController _ _ _ -> error "retrieveAndRunLayout called, but returned CodeLoadController"
+                  CodeLoadFailure    e     -> return $ cdata e
+
+insertView :: String -> String -> View XML
+insertView c a = 
+             do debugM $ "    Layout: insertView : loading   " ++ c ++ " - " ++ a
+                c <- retrieveCode CTView (c, (toLower (head a)):(tail a))
+                case c of
+                  CodeLoadView       v _ _ -> v 
+                  CodeLoadController _ _ _ -> error "retrieveAndRunLayout called, but returned CodeLoadController"
+                  CodeLoadFailure    e     -> return $ cdata e
+
 insertComponent :: String -> String -> [(String, String)] -> View XML
 insertComponent controller action opts =
            do debugM $ " insertComponent: Starting"