implemented pager

[Rakka.git] / Rakka / Page.hs

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index 6d3dff0bdb927ff15c863fd165ed49197b10dc4d..5d7ef68c455795a36912676ea202643f50f91d0e 100644 (file)
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -12,6 +12,7 @@ module Rakka.Page
     , pageUpdateInfo
     , pageRevision
 
+    , isSafeChar
     , encodePageName
     , decodePageName
 
@@ -20,7 +21,7 @@ module Rakka.Page
     , mkObjectURI
     , mkFragmentURI
     , mkAuxiliaryURI
-    , mkRDFURI
+    , mkFeedURI
     , mkRakkaURI
 
     , xmlizePage
@@ -151,14 +152,14 @@ encodeFragment = escapeURIString isSafeChar . UTF8.encodeString
 mkPageURI :: URI -> PageName -> URI
 mkPageURI baseURI name
     = baseURI {
-        uriPath = foldl (</>) "/" [uriPath baseURI, encodePageName name ++ ".html"]
+        uriPath = uriPath baseURI </> encodePageName name <.> "html"
       }
 
 
 mkPageFragmentURI :: URI -> PageName -> String -> URI
 mkPageFragmentURI baseURI name fragment
     = baseURI {
-        uriPath     = foldl (</>) "/" [uriPath baseURI, encodePageName name ++ ".html"]
+        uriPath     = uriPath baseURI </> encodePageName name <.> "html"
       , uriFragment = ('#' : encodeFragment fragment)
       }
 
@@ -182,10 +183,10 @@ mkAuxiliaryURI baseURI basePath name
       }
 
 
-mkRDFURI :: URI -> PageName -> URI
-mkRDFURI baseURI name
+mkFeedURI :: URI -> PageName -> URI
+mkFeedURI baseURI name
     = baseURI {
-        uriPath = foldl (</>) "/" [uriPath baseURI, encodePageName name ++ ".rdf"]
+        uriPath = uriPath baseURI </> encodePageName name <.> "rdf"
       }