merge branch origin/master

[Rakka.git] / Rakka / Resource / PageEntity.hs

diff --git a/Rakka/Resource/PageEntity.hs b/Rakka/Resource/PageEntity.hs
index 1388f71cc78024f144b7ad44f9a6dcdfc7b6f250..397f8d4dd5e04436a47638abfdd2c3a3606a3986 100644 (file)
--- a/Rakka/Resource/PageEntity.hs
+++ b/Rakka/Resource/PageEntity.hs
@@ -24,6 +24,7 @@ import           Data.Maybe
 import Data.Monoid.Unicode
 import qualified Data.Text as T
 import           Data.Time
+import qualified Data.Time.W3C as W3C
 import           Network.HTTP.Lucu
 import           Network.URI hiding (path)
 import Prelude.Unicode
@@ -33,7 +34,6 @@ import           Rakka.Resource
 import           Rakka.Storage
 import           Rakka.SystemConfig
 import           Rakka.Utils
-import           Rakka.W3CDateTime
 import           Rakka.Wiki.Engine
 import           System.FilePath.Posix
 import           Text.HyperEstraier hiding (getText)
@@ -230,7 +230,6 @@ entityToRSS env
                 += sattr "xmlns"           "http://purl.org/rss/1.0/"
                 += sattr "xmlns:rdf"       "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
                 += sattr "xmlns:dc"        "http://purl.org/dc/elements/1.1/"
-                += sattr "xmlns:trackback" "http://madskills.com/public/xml/rss/module/trackback/"
                 += ( eelem "channel"
                      += sattr "rdf:about" (uriToString id (mkFeedURI baseURI (T.pack name)) "")
                      += ( eelem "title"
@@ -278,14 +277,11 @@ entityToRSS env
                      += ( eelem "dc:date"
                           += ( arrIO (utcToLocalZonedTime . entityLastMod)
                                ⋙
-                               arr formatW3CDateTime
+                               arr W3C.format
                                ⋙
                                mkText
                              )
                         )
-                     += ( eelem "trackback:ping"
-                          += attr "rdf:resource" (arr (mkTrackbackURIStr baseURI . entityName) ⋙ mkText)
-                        )
                    )
                 ⋙
                 uniqueNamespacesFromDeclAndQNames
@@ -295,10 +291,6 @@ entityToRSS env
       mkPageURIStr baseURI name
             = uriToString id (mkPageURI baseURI name) ""
 
-      mkTrackbackURIStr :: URI → PageName → String
-      mkTrackbackURIStr baseURI name
-            = uriToString id (mkAuxiliaryURI baseURI ["trackback"] name) ""
-
 readSubPage ∷ (ArrowXml (⇝), ArrowChoice (⇝), ArrowIO (⇝))
             ⇒ Environment
             → (PageName, Maybe XmlTree, PageName) ⇝ XmlTree