From a785f4746da0de7cf43acfac6b4781fadab42ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Delano=C3=AB?= <devel+git@delanoe.org>
Date: Wed, 2 Jan 2019 11:54:10 +0100
Subject: [PATCH] [TEXT][PARSERS] Isidore update query.
---
src/Gargantext/Text/Parsers/Isidore.hs | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/Gargantext/Text/Parsers/Isidore.hs b/src/Gargantext/Text/Parsers/Isidore.hs
index b44b49a6..4521d7bc 100644
--- a/src/Gargantext/Text/Parsers/Isidore.hs
+++ b/src/Gargantext/Text/Parsers/Isidore.hs
@@ -9,37 +9,37 @@ import Database.HSparql.Connection
import Database.HSparql.QueryGenerator
-- import Data.RDF hiding (triple)
-import Data.Text
+import Data.Text hiding (groupBy)
route = "http://isidore.science/sparql/"
--selectExample :: IO (Maybe [Text])
-selectIsidore = do
- res <- selectQuery route simpleSelect
+isidore q = do
+ res <- selectQuery route $ simpleSelect q
pure res
-simpleSelect :: Query SelectQuery
-simpleSelect = do
+simpleSelect :: Text -> Query SelectQuery
+simpleSelect q = do
isidore <- prefix "isidore" (iriRef "http://www.rechercheisidore.fr/class")
rdf <- prefix "rdf" (iriRef "http://www.w3.org/1999/02/22-rdf-syntax-ns#")
dcterms <- prefix "dcterms" (iriRef "http://purl.org/dc/terms")
dc <- prefix "dc" (iriRef "http://purl.org/dc")
doc <- var
- resource <- var
title <- var
date <- var
abstract <- var
source <- var
- triple resource (rdf .:. "type") (isidore .:. "BibliographicalResource")
-
+ triple doc (rdf .:. "type") (isidore .:. "BibliographicalResource")
triple doc (dcterms .:. "title") title
triple doc (dcterms .:. "date") date
triple doc (dcterms .:. "source") source
triple doc (dc .:. "description") abstract
- filterExpr $ contains title ("ville" :: Text)
+ filterExpr $ (.||.) (contains title q) (contains abstract q)
+ groupBy title
+ groupBy source
- selectVars [title]
+ selectVars [title, date, source, abstract]
--
2.21.0