From 107793cbf12990c268391d8d546d0271bea9dc7f Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sun, 17 Mar 2019 21:52:13 +0100 Subject: [PATCH] Change to Curl --- ShadowLibrary/Core.hs | 14 +++++++------- app/almanachmuszyny.hs | 2 +- shadow-library.cabal | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ShadowLibrary/Core.hs b/ShadowLibrary/Core.hs index 678df33..84c7850 100644 --- a/ShadowLibrary/Core.hs +++ b/ShadowLibrary/Core.hs @@ -33,7 +33,7 @@ import Data.Tree.NTree.TypeDefs import Data.Maybe import Control.Monad.Trans import Text.XML.HXT.XPath --- import Text.XML.HXT.Curl +import Text.XML.HXT.Curl import Text.XML.HXT.HTTP import Text.Regex.TDFA @@ -64,8 +64,8 @@ downloadDocument = readFromDocument [withParseHTML yes, withEncodingErrors no, withPreserveComment yes, withStrictInput yes, - withHTTP [] --- withCurl [("curl--user-agent","AMU Digital Libraries Indexing Agent")] +-- withHTTP [] + withCurl [("curl--user-agent","AMU Digital Libraries Indexing Agent")] ] downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes, @@ -73,13 +73,13 @@ downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes, withEncodingErrors no, withPreserveComment yes, withInputEncoding enc, - withHTTP []] --- withCurl []] +-- withHTTP []] + withCurl []] downloadXmlDocument = readFromDocument [withWarnings no, withEncodingErrors no, - withHTTP []] --- withCurl [] ] +-- withHTTP []] + withCurl [] ] data ShadowLibrary = ShadowLibrary { logoUrl :: Maybe String, diff --git a/app/almanachmuszyny.hs b/app/almanachmuszyny.hs index 1cf9c4d..2569177 100644 --- a/app/almanachmuszyny.hs +++ b/app/almanachmuszyny.hs @@ -4,7 +4,7 @@ import ShadowLibrary.Core import Text.XML.HXT.Core import Text.XML.HXT.XPath --- import Text.XML.HXT.Curl +--import Text.XML.HXT.Curl import Data.List import Data.List.Utils (replace) diff --git a/shadow-library.cabal b/shadow-library.cabal index cd77195..3e1bd4e 100644 --- a/shadow-library.cabal +++ b/shadow-library.cabal @@ -20,6 +20,7 @@ library , HTTP , hxt , hxt-http + , hxt-curl , hxt-xpath , MissingH , monad-logger @@ -54,6 +55,7 @@ executable almanachmuszyny build-depends: base , hxt , hxt-xpath + , hxt-curl , MissingH , regex-posix , shadow-library