Compare commits

..

No commits in common. "master" and "master" have entirely different histories.

5 changed files with 8 additions and 87 deletions

View File

@ -33,7 +33,7 @@ import Data.Tree.NTree.TypeDefs
import Data.Maybe import Data.Maybe
import Control.Monad.Trans import Control.Monad.Trans
import Text.XML.HXT.XPath import Text.XML.HXT.XPath
import Text.XML.HXT.Curl -- import Text.XML.HXT.Curl
import Text.XML.HXT.HTTP import Text.XML.HXT.HTTP
import Text.Regex.TDFA import Text.Regex.TDFA
@ -64,8 +64,8 @@ downloadDocument = readFromDocument [withParseHTML yes,
withEncodingErrors no, withEncodingErrors no,
withPreserveComment yes, withPreserveComment yes,
withStrictInput yes, withStrictInput yes,
-- withHTTP [] withHTTP []
withCurl [("curl--user-agent","AMU Digital Libraries Indexing Agent")] -- withCurl [("curl--user-agent","AMU Digital Libraries Indexing Agent")]
] ]
downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes, downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes,
@ -73,13 +73,13 @@ downloadDocumentWithEncoding enc = readFromDocument [withParseHTML yes,
withEncodingErrors no, withEncodingErrors no,
withPreserveComment yes, withPreserveComment yes,
withInputEncoding enc, withInputEncoding enc,
-- withHTTP []] withHTTP []]
withCurl []] -- withCurl []]
downloadXmlDocument = readFromDocument [withWarnings no, downloadXmlDocument = readFromDocument [withWarnings no,
withEncodingErrors no, withEncodingErrors no,
-- withHTTP []] withHTTP []]
withCurl [] ] -- withCurl [] ]
data ShadowLibrary = ShadowLibrary { logoUrl :: Maybe String, data ShadowLibrary = ShadowLibrary { logoUrl :: Maybe String,

View File

@ -4,7 +4,7 @@ import ShadowLibrary.Core
import Text.XML.HXT.Core import Text.XML.HXT.Core
import Text.XML.HXT.XPath import Text.XML.HXT.XPath
--import Text.XML.HXT.Curl -- import Text.XML.HXT.Curl
import Data.List import Data.List
import Data.List.Utils (replace) import Data.List.Utils (replace)

View File

@ -1,47 +0,0 @@
{-# LANGUAGE Arrows, NoMonomorphismRestriction #-}
import ShadowLibrary.Core
import Text.XML.HXT.Core
import Text.XML.HXT.XPath
import Data.List
import Data.List.Utils (replace)
import Text.Regex.Posix
import Text.Printf
extractRecords = extractLinksWithText "//a[contains(@href,'.pdf') and contains(text(),'popowice')]"
toShadowItem :: (String, String) -> ShadowItem
toShadowItem (url, articleTitle) =
(defaultShadowItem url title) {
originalDate = Just date,
itype = "periodical",
format = Just "pdf"
}
where title = "Nasze Popowice " ++ getNr url
date = getDate url
replaceSeparatorWithSpace = map (\c -> if c=='_' then ' '; else if c=='-' then ' '; else c)
replaceUnderscoreWithDash = map (\c -> if c=='_' then '-'; else c)
getNr url =
case url =~~ "nr[-_][0-9][0-9](_cz-[0-9])?" :: Maybe String of
Just nr -> replaceSeparatorWithSpace nr
otherwise -> error $ "unexpected url: " ++ url
getDate url =
case url =~~ "20[0-9][0-9]_[0-1][0-9]" :: Maybe String of
Just date -> replaceUnderscoreWithDash date
otherwise -> error $ "unexpected url: " ++ url
main = do
let start = "https://smpopowice.pl/index.php/numery-archiwalne"
let shadowLibrary = ShadowLibrary {logoUrl=Nothing,
lname="Nasze Popowice",
abbrev="NaszPop",
lLevel=0,
webpage=start}
extractItemsStartingFromUrl shadowLibrary start (extractRecords >>> arr toShadowItem)

View File

@ -20,7 +20,6 @@ library
, HTTP , HTTP
, hxt , hxt
, hxt-http , hxt-http
, hxt-curl
, hxt-xpath , hxt-xpath
, MissingH , MissingH
, monad-logger , monad-logger
@ -55,23 +54,11 @@ executable almanachmuszyny
build-depends: base build-depends: base
, hxt , hxt
, hxt-xpath , hxt-xpath
, hxt-curl
, MissingH , MissingH
, regex-posix , regex-posix
, shadow-library , shadow-library
default-language: Haskell2010 default-language: Haskell2010
executable naszepopowice
hs-source-dirs: app
main-is: naszepopowice.hs
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends: base
, hxt
, hxt-xpath
, MissingH
, regex-posix
, shadow-library
default-language: Haskell2010
source-repository head source-repository head
type: git type: git

View File

@ -1,19 +0,0 @@
# This file was autogenerated by Stack.
# You should not edit this file by hand.
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files
packages:
- completed:
hackage: hxt-xpath-9.1.2.2@sha256:9cd590ae93a04573db8f90fa4094625ebd97dded45da7667c577ce6b38a42900,1999
pantry-tree:
size: 2225
sha256: aee2f75974e868ff429b8ff349a29667536c60397098f5dfedc968d1951511bb
original:
hackage: hxt-xpath-9.1.2.2
snapshots:
- completed:
size: 507596
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/11/9.yaml
sha256: 42f472dbf06482da1b3319241f3e3b3593a45bd7d4f537d2789f21386b9b2ad3
original: lts-11.9