Compare commits

...

6 Commits

Author SHA1 Message Date
c77fe1a502 . 2021-04-19 23:58:35 +02:00
cc670f1f7c dziala, ale bez tytulu i daty 2021-04-13 22:37:09 +02:00
fbd7f7e448 nawet cos dziala 2021-04-13 20:35:20 +02:00
f14d53337e :( 2021-04-13 19:15:17 +02:00
8f3e9c8fae Merge branch 'withcurl' of git://gonito.net/twilight-library 2021-04-13 15:13:54 +02:00
107793cbf1 Change to Curl 2019-03-17 21:52:13 +01:00
5 changed files with 84 additions and 8 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)

42
app/pbsociety.hs Normal file
View File

@ -0,0 +1,42 @@
{-# LANGUAGE Arrows, NoMonomorphismRestriction #-}
import ShadowLibrary.Core
import Text.XML.HXT.Core
import Text.XML.HXT.XPath
import Text.XML.HXT.Curl
import Data.List
import Data.List.Utils (replace)
import Text.Regex.Posix
import Text.Printf
extractRecords = extractLinksWithText "//a[@class='image-link']" -- pary adres-tytuł
>>> first (extractLinksWithText "//div/a[contains(@href,'.pdf') and not(@class)]")
-- ... a tutaj te trójki przerabiamy do docelowej struktury ShadowItem
toShadowItem :: ((String, String),String) -> ShadowItem
toShadowItem ((url, articleTitle), yearlyTitle) =
(defaultShadowItem url title) {
--originalDate = Just date,
itype = "periodical",
format = Just "pdf",
finalUrl = url
}
where title = "Pbsociety " ++ yearlyTitle ++ " " ++ articleTitle
--date = getDate url
getDate url =
case url =~~ "/(19[0-9][0-9]|20[0-9][0-9])/" :: Maybe [[String]] of
Just [[_, year]] -> year
otherwise -> error $ "unexpected url: " ++ url
main = do
let start = "https://pbsociety.org.pl/repository/discover?filtertype_1=has_content_in_original_bundle&filter_relational_operator_1=equals&filter_1=true&filtertype_2=title&filter_relational_operator_2=contains&filter_2=&submit_apply_filter=Apply&query=&scope=%2F&rpp=260&sort_by=score&order=desc"
let shadowLibrary = ShadowLibrary {logoUrl=Nothing,
lname="Polish Botanical Society Repository",
abbrev="Pbsociety",
lLevel=0,
webpage=start}
extractItemsStartingFromUrl shadowLibrary start (extractRecords >>> arr toShadowItem)

View File

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

19
stack.yaml.lock Normal file
View File

@ -0,0 +1,19 @@
# 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