X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FResource.hs;h=a1c4d90af52b3847b7896ae5904a5690d04e09fe;hb=88747f2;hp=9f3af22fd6ef2752c0acdece23c4926177427bbc;hpb=ed0a2de09fc91fbd25c3ee82a722ef88793f2a8f;p=Rakka.git

diff --git a/Rakka/Resource.hs b/Rakka/Resource.hs
index 9f3af22..a1c4d90 100644
--- a/Rakka/Resource.hs
+++ b/Rakka/Resource.hs
@@ -1,14 +1,14 @@
 module Rakka.Resource
     ( runIdempotentA
+    , runIdempotentA'
     , runXmlA
     , getEntityType
     , outputXmlPage
     , outputXmlPage'
+    , outputXml
     , getUserID
     )
     where
-
-import qualified Codec.Binary.UTF8.String as UTF8
 import           Control.Arrow
 import           Control.Arrow.ArrowList
 import           Control.Monad
@@ -23,7 +23,6 @@ import           System.FilePath.Posix
 import           System.Log.Logger
 import           Text.XML.HXT.Arrow.ReadDocument
 import           Text.XML.HXT.Arrow.WriteDocument
-import           Text.XML.HXT.Arrow.XmlIOStateArrow
 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 
@@ -68,6 +67,17 @@ runIdempotentA baseURI a
          rsrc
 
 
+runIdempotentA' :: IOSArrow () (Resource c) -> Resource c
+runIdempotentA' a
+    = do [rsrc] <- liftIO $ runX ( setErrorMsgHandler False fail
+                                   >>>
+                                   constA ()
+                                   >>>
+                                   a
+                                 )
+         rsrc
+
+
 runXmlA :: Environment -> FilePath -> IOSArrow XmlTree (Resource c) -> Resource c
 runXmlA env schemaPath a
     = do inputA <- getInputXmlA env schemaPath
@@ -149,7 +159,9 @@ outputXmlPage tree formatters
                                         >>>
                                         formatter
                                         >>>
-                                        writeDocumentToString [ (a_indent, v_1) ]
+                                        writeDocumentToString [ (a_indent         , v_1 )
+                                                              , (a_output_encoding, utf8)
+                                                              , (a_no_xml_pi      , v_0 ) ]
                                       )
          output resultStr
 
@@ -159,6 +171,20 @@ outputXmlPage' tree toXHTML
     = outputXmlPage tree [(MIMEType "application" "xhtml+xml" [], toXHTML)]
 
 
+outputXml :: XmlTree -> Resource ()
+outputXml tree
+    = do setContentType (MIMEType "text" "xml" [])
+         [xmlStr] <- liftIO $ runX ( setErrorMsgHandler False fail
+				     >>>
+				     constA tree
+				     >>>
+				     writeDocumentToString [ (a_indent         , v_1 )
+                                                           , (a_output_encoding, utf8)
+                                                           , (a_no_xml_pi      , v_0 ) ]
+				   )
+	 output xmlStr
+
+
 getUserID :: Environment -> Resource (Maybe String)
 getUserID env
     = do auth <- getAuthorization