rdf4h 1.2.1 → 1.2.2
raw patch · 2 files changed
+6/−6 lines, 2 filesdep ~hxt
Dependency ranges changed: hxt
Files
- rdf4h.cabal +4/−4
- src/Text/RDF/RDF4H/XmlParser.hs +2/−2
rdf4h.cabal view
@@ -1,5 +1,5 @@ name: rdf4h-version: 1.2.1+version: 1.2.2 synopsis: A library for RDF processing in Haskell description: 'RDF for Haskell' is a library for working with RDF in Haskell.@@ -54,7 +54,7 @@ build-depends: parsec >= 3 , network >= 2.2.0.0 , HTTP >= 4000.0.0- , hxt >= 9.0.0+ , hxt >= 9.3.1.2 , text other-modules: Text.RDF.RDF4H.ParserUtils , Text.RDF.RDF4H.Interact@@ -71,7 +71,7 @@ build-depends: parsec >= 3 , network >= 2.2.0.0 , HTTP >= 4000.0.0- , hxt >= 9.0.0+ , hxt >= 9.3.1.2 , containers , text hs-source-dirs: src@@ -93,7 +93,7 @@ , QuickCheck >= 1.2.0.0 , HUnit >= 1.2.2.1 , bytestring- , hxt+ , hxt >= 9.3.1.2 , containers , text , knob
src/Text/RDF/RDF4H/XmlParser.hs view
@@ -15,7 +15,7 @@ import Data.RDF.Types (RDF,RdfParser(..),Node(BNodeGen),BaseUrl(..),Triple(..),Triples,Subject,Predicate,Object,PrefixMappings(..),ParseFailure(ParseFailure),mkRdf,lnode,plainL,plainLL,typedL,unode,bnode) import qualified Data.Text as T (Text,pack,unpack) import qualified Data.Text.IO as TIO-import Text.XML.HXT.Core (ArrowXml,XmlTree,IfThen((:->)),(>.),(>>.),first,neg,(<+>),expandURI,getName,getAttrValue,getAttrValue0,getAttrl,hasAttrValue,hasAttr,constA,choiceA,getChildren,ifA,arr2A,second,hasName,isElem,xshow,listA,isA,isText,getText,this,unlistA,orElse,sattr,mkelem,xread,runSLA)+import Text.XML.HXT.Core (ArrowXml,XmlTree,IfThen((:->)),(>.),(>>.),first,neg,(<+>),expandURI,getName,getAttrValue,getAttrValue0,getAttrl,hasAttrValue,hasAttr,constA,choiceA,getChildren,ifA,arr2A,second,hasName,isElem,xshow,listA,isA,isText,getText,this,unlistA,orElse,sattr,mkelem,xreadDoc,runSLA) -- TODO: write QuickCheck tests for XmlParser instance for RdfParser. @@ -85,7 +85,7 @@ parseXmlRDF bUrl dUrl xmlStr = case runParseArrow of (_,r:_) -> Right r _ -> Left (ParseFailure "XML parsing failed")- where runParseArrow = runSLA (xread >>> addMetaData bUrl dUrl >>> getRDF) initState (T.unpack xmlStr)+ where runParseArrow = runSLA (xreadDoc >>> isElem >>> addMetaData bUrl dUrl >>> getRDF) initState (T.unpack xmlStr) initState = GParseState { stateGenId = 0 } -- |Add a root tag to a given XmlTree to appear as if it was read from a readDocument function