X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FResource%2FPageEntity.hs;h=670958e80c6d4b2ecf31c82f640e19f34eabc9ff;hb=0b97160b4d55eca16f3c56b47a908997fc458284;hp=e354004728c746caa043200d2c1ef9b336e39ec4;hpb=ed0a2de09fc91fbd25c3ee82a722ef88793f2a8f;p=Rakka.git

diff --git a/Rakka/Resource/PageEntity.hs b/Rakka/Resource/PageEntity.hs
index e354004..670958e 100644
--- a/Rakka/Resource/PageEntity.hs
+++ b/Rakka/Resource/PageEntity.hs
@@ -3,12 +3,9 @@ module Rakka.Resource.PageEntity
     )
     where
 
-import           Control.Arrow
-import           Control.Arrow.ArrowIO
-import           Control.Arrow.ArrowIf
-import           Control.Arrow.ArrowList
 import           Control.Monad.Trans
 import           Data.Char
+import qualified Data.Map as M
 import           Data.Maybe
 import           Data.Time
 import           Network.HTTP.Lucu
@@ -24,11 +21,7 @@ import           Rakka.W3CDateTime
 import           Rakka.Wiki.Engine
 import           System.FilePath
 import           Text.HyperEstraier hiding (getText)
-import           Text.XML.HXT.Arrow.Namespace
-import           Text.XML.HXT.Arrow.WriteDocument
-import           Text.XML.HXT.Arrow.XmlArrow
-import           Text.XML.HXT.Arrow.XmlIOStateArrow
-import           Text.XML.HXT.Arrow.XmlNodeSet
+import           Text.XML.HXT.Arrow
 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 
@@ -125,9 +118,9 @@ entityToXHTML env
 
           feeds <- arrIO0 (findFeeds (envStorage env)) -< ()
 
-          pageTitle    <- listA (readSubPage env) -< (Just name, Just page, "PageTitle")
-          leftSideBar  <- listA (readSubPage env) -< (Just name, Just page, "SideBar/Left")
-          rightSideBar <- listA (readSubPage env) -< (Just name, Just page, "SideBar/Right")
+          pageTitle    <- listA (readSubPage env) -< (name, Just page, "PageTitle")
+          leftSideBar  <- listA (readSubPage env) -< (name, Just page, "SideBar/Left")
+          rightSideBar <- listA (readSubPage env) -< (name, Just page, "SideBar/Right")
           pageBody     <- listA (makeMainXHTML (envStorage env) (envSysConf env) (envInterpTable env)) -< page
 
           ( eelem "/"
@@ -301,13 +294,38 @@ entityToRSS env
 
 readSubPage :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
                Environment
-            -> a (Maybe PageName, Maybe XmlTree, PageName) XmlTree
+            -> a (PageName, Maybe XmlTree, PageName) XmlTree
 readSubPage env
     = proc (mainPageName, mainPage, subPageName) ->
-      do subPage  <- getPageA (envStorage env) >>> arr fromJust >>> xmlizePage -< (subPageName, Nothing)
-         subXHTML <- makeSubXHTML (envStorage env) (envSysConf env) (envInterpTable env)
-                     -< (mainPageName, mainPage, subPage)
+      do langM        <- case mainPage of
+                           Nothing
+                               -> returnA -< Nothing
+                           Just p
+                               -> maybeA (getXPathTreesInDoc "/page/@lang/text()" >>> getText) -< p
+         subPage      <- getPageA (envStorage env) >>> arr fromJust -< (subPageName, Nothing)
+         localSubPage <- case langM of
+                           Nothing
+                               -> returnA -< subPage
+                           Just l
+                               -> localize (envStorage env) -< (l, subPage)
+         subPageXml   <- xmlizePage -< localSubPage
+         subXHTML     <- makeSubXHTML (envStorage env) (envSysConf env) (envInterpTable env)
+                         -< (Just mainPageName, mainPage, subPageXml)
          returnA -< subXHTML
+    where
+      localize :: (ArrowChoice a, ArrowIO a) => Storage -> a (LanguageTag, Page) Page
+      localize sto
+          = proc (lang, origPage)
+          -> do let otherLang = entityOtherLang origPage
+                    localName = M.lookup lang otherLang
+                case localName of
+                  Nothing
+                      -> returnA -< origPage
+                  Just ln
+                      -> do localPage <- getPageA sto -< (ln, Nothing)
+                            returnA -< case localPage of
+                                         Nothing -> origPage
+                                         Just p  -> p
 
 
 {-
@@ -346,9 +364,9 @@ pageListingToXHTML env
           let cssHref   = [uriToString id (mkObjectURI baseURI styleSheet) ""]
               scriptSrc = [uriToString id (baseURI { uriPath = uriPath baseURI </> "js" }) ""]
 
-          pageTitle    <- listA (readSubPage env) -< (Just name, Nothing, "PageTitle")
-          leftSideBar  <- listA (readSubPage env) -< (Just name, Nothing, "SideBar/Left")
-          rightSideBar <- listA (readSubPage env) -< (Just name, Nothing, "SideBar/Right")
+          pageTitle    <- listA (readSubPage env) -< (name, Nothing, "PageTitle")
+          leftSideBar  <- listA (readSubPage env) -< (name, Nothing, "SideBar/Left")
+          rightSideBar <- listA (readSubPage env) -< (name, Nothing, "SideBar/Right")
 
           ( eelem "/"
             += ( eelem "html"
@@ -458,9 +476,9 @@ notFoundToXHTML env
           let cssHref   = [uriToString id (mkObjectURI baseURI styleSheet) ""]
               scriptSrc = [uriToString id (baseURI { uriPath = uriPath baseURI </> "js" }) ""]
 
-          pageTitle    <- listA (readSubPage env) -< (Just name, Nothing, "PageTitle")
-          leftSideBar  <- listA (readSubPage env) -< (Just name, Nothing, "SideBar/Left")
-          rightSideBar <- listA (readSubPage env) -< (Just name, Nothing, "SideBar/Right")
+          pageTitle    <- listA (readSubPage env) -< (name, Nothing, "PageTitle")
+          leftSideBar  <- listA (readSubPage env) -< (name, Nothing, "SideBar/Left")
+          rightSideBar <- listA (readSubPage env) -< (name, Nothing, "SideBar/Right")
 
           ( eelem "/"
             += ( eelem "html"
@@ -556,4 +574,4 @@ findFeeds sto
 
 mkFeedURIStr :: URI -> PageName -> String
 mkFeedURIStr baseURI name
-    = uriToString id (mkFeedURI baseURI name) ""
\ No newline at end of file
+    = uriToString id (mkFeedURI baseURI name) ""