From 5723d3f314b349f6852a2d91d568f0dbcee0b87e Mon Sep 17 00:00:00 2001
From: Esko Ikkala <esko.ikkala@aalto.fi>
Date: Tue, 2 Oct 2018 15:01:05 +0300
Subject: [PATCH] Order manuscripts by concatenated creation place
---
src/server/sparql/Datasets.js | 10 +++++-----
src/server/sparql/Mappers.js | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/server/sparql/Datasets.js b/src/server/sparql/Datasets.js
index aa77a95d..cad11b03 100644
--- a/src/server/sparql/Datasets.js
+++ b/src/server/sparql/Datasets.js
@@ -19,7 +19,7 @@ module.exports = {
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
PREFIX sdbm: <https://sdbm.library.upenn.edu/>
SELECT
- ?id ?manuscriptRecord ?entry
+ ?id ?manuscriptRecord
(GROUP_CONCAT(DISTINCT ?prefLabel_; SEPARATOR=" | ") AS ?prefLabel)
(GROUP_CONCAT(DISTINCT ?author_; SEPARATOR="|") AS ?author)
(GROUP_CONCAT(DISTINCT ?timespan_; SEPARATOR="|") AS ?timespan)
@@ -34,17 +34,17 @@ module.exports = {
OPTIONAL {
?expression_creation crm:P14_carried_out_by ?authorId .
?authorId skos:prefLabel ?authorLabel
- BIND(CONCAT(STR(?authorId), ";", STR(?authorLabel)) AS ?author_)
+ BIND(CONCAT(STR(?authorLabel), ";", STR(?authorId)) AS ?author_)
}
OPTIONAL {
?expression_creation crm:P4_has_time_span ?timespanId .
?timespanId skos:prefLabel ?timespanLabel .
- BIND(CONCAT(STR(?timespanId), ";", STR(?timespanLabel)) AS ?timespan_)
+ BIND(CONCAT(STR(?timespanLabel), ";", STR(?timespanId)) AS ?timespan_)
}
OPTIONAL {
?expression_creation crm:P7_took_place_at ?creationPlaceId .
?creationPlaceId skos:prefLabel ?creationPlaceLabel .
- BIND(CONCAT(STR(?creationPlaceId), ";", STR(?creationPlaceLabel)) AS ?creationPlace_)
+ BIND(CONCAT(STR(?creationPlaceLabel), ";", STR(?creationPlaceId)) AS ?creationPlace_)
}
OPTIONAL {
?id crm:P128_carries ?expression .
@@ -52,7 +52,7 @@ module.exports = {
}
OPTIONAL { ?id mmm-schema:manuscript_record ?manuscriptRecord . }
}
- GROUP BY ?id ?manuscriptRecord ?entry
+ GROUP BY ?id ?manuscriptRecord
ORDER BY DESC(?creationPlace)
LIMIT 2000
`,
diff --git a/src/server/sparql/Mappers.js b/src/server/sparql/Mappers.js
index 05935ab9..a983d42e 100644
--- a/src/server/sparql/Mappers.js
+++ b/src/server/sparql/Mappers.js
@@ -67,9 +67,9 @@ const createObjectList = (str, sdbmType) => {
return strings.map(s => {
const values = s.split(';');
return {
- id: values[0].substring(values[0].lastIndexOf('/') + 1),
+ id: values[1].substring(values[1].lastIndexOf('/') + 1),
//id: values[0],
- prefLabel: values[1],
+ prefLabel: values[0],
sdbmType: sdbmType
};
});
--
GitLab