From c3025d5eef44e42f945307fa586668b8ed8e4035 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Tue, 12 May 2020 12:38:40 +0300
Subject: [PATCH] Fix prefixes path
---
src/server/sparql/JenaQuery.js | 15 +++++++++++----
src/server/sparql/sampo/BackendSearchConfig.js | 9 ++++-----
.../perspective_configs/Perspective1Config.js | 2 +-
.../perspective_configs/Perspective2Config.js | 2 +-
.../perspective_configs/Perspective3Config.js | 2 +-
5 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/server/sparql/JenaQuery.js b/src/server/sparql/JenaQuery.js
index 07809e89..87eaa5f3 100644
--- a/src/server/sparql/JenaQuery.js
+++ b/src/server/sparql/JenaQuery.js
@@ -1,7 +1,7 @@
-import { runSelectQuery } from './SparqlApi''
+import { has } from 'lodash'
+import { runSelectQuery } from './SparqlApi'
import { jenaQuery } from './SparqlQueriesGeneral'
import { makeObjectList } from './SparqlObjectMapper'
-import { fullTextSearchProperties } from './sampo/SparqlQueriesFullText'
export const queryJenaIndex = async ({
backendSearchConfig,
@@ -10,9 +10,16 @@ export const queryJenaIndex = async ({
resultFormat
}) => {
let q = jenaQuery
- const endpoint = backendSearchConfig[resultClass].endpoint
+ const config = backendSearchConfig[resultClass]
+ let endpoint
+ if (has(config, 'endpoint')) {
+ endpoint = config.endpoint
+ } else {
+ endpoint = backendSearchConfig[config.perspectiveID].endpoint
+ }
+ const { properties } = config
q = q.replace('<QUERY>', `?id text:query ('${queryTerm.toLowerCase()}' 2000) .`)
- q = q.replace('<RESULT_SET_PROPERTIES>', fullTextSearchProperties)
+ q = q.replace('<RESULT_SET_PROPERTIES>', properties)
const results = await runSelectQuery({
query: endpoint.prefixes + q,
endpoint: endpoint.url,
diff --git a/src/server/sparql/sampo/BackendSearchConfig.js b/src/server/sparql/sampo/BackendSearchConfig.js
index 1a7ba3b7..9a6aac23 100644
--- a/src/server/sparql/sampo/BackendSearchConfig.js
+++ b/src/server/sparql/sampo/BackendSearchConfig.js
@@ -13,6 +13,7 @@ import {
lastKnownLocationsAt
} from './sparql_queries/SparqlQueriesPlaces'
import { federatedSearchDatasets } from './sparql_queries/SparqlQueriesFederatedSearch'
+import { fullTextSearchProperties } from './sparql_queries/SparqlQueriesFullText'
import { makeObjectList } from '../SparqlObjectMapper'
import { mapPlaces } from '../Mappers'
@@ -21,7 +22,7 @@ export const backendSearchConfig = {
perspective2: perspective2Config,
perspective3: perspective3Config,
placesMsProduced: {
- perspectiveID: 'perspective1',
+ perspectiveID: 'perspective1', // use endpoint config from perspective1
q: productionPlacesQuery,
filterTarget: 'manuscripts',
resultMapper: mapPlaces,
@@ -57,10 +58,8 @@ export const backendSearchConfig = {
}
},
jenaText: {
- endpoint: {
- url: 'http://ldf.fi/mmm/sparql',
- useAuth: false
- }
+ perspectiveID: 'perspective1',
+ properties: fullTextSearchProperties
},
federatedSearch: {
datasets: federatedSearchDatasets
diff --git a/src/server/sparql/sampo/perspective_configs/Perspective1Config.js b/src/server/sparql/sampo/perspective_configs/Perspective1Config.js
index 4ed72e67..75b5f536 100644
--- a/src/server/sparql/sampo/perspective_configs/Perspective1Config.js
+++ b/src/server/sparql/sampo/perspective_configs/Perspective1Config.js
@@ -2,7 +2,7 @@ import {
manuscriptPropertiesFacetResults,
manuscriptPropertiesInstancePage
} from '../sparql_queries/SparqlQueriesPerspective1'
-import { prefixes } from './sampo/SparqlQueriesPrefixes'
+import { prefixes } from '../sparql_queries/SparqlQueriesPrefixes'
export const perspective1Config = {
endpoint: {
diff --git a/src/server/sparql/sampo/perspective_configs/Perspective2Config.js b/src/server/sparql/sampo/perspective_configs/Perspective2Config.js
index 8c97b9da..91114e0d 100644
--- a/src/server/sparql/sampo/perspective_configs/Perspective2Config.js
+++ b/src/server/sparql/sampo/perspective_configs/Perspective2Config.js
@@ -1,7 +1,7 @@
import {
workProperties
} from '../sparql_queries/SparqlQueriesPerspective2'
-import { prefixes } from './sampo/SparqlQueriesPrefixes'
+import { prefixes } from '../sparql_queries/SparqlQueriesPrefixes'
export const perspective2Config = {
endpoint: {
diff --git a/src/server/sparql/sampo/perspective_configs/Perspective3Config.js b/src/server/sparql/sampo/perspective_configs/Perspective3Config.js
index f957dc55..3b2b7774 100644
--- a/src/server/sparql/sampo/perspective_configs/Perspective3Config.js
+++ b/src/server/sparql/sampo/perspective_configs/Perspective3Config.js
@@ -1,7 +1,7 @@
import {
eventProperties
} from '../sparql_queries/SparqlQueriesPerspective3'
-import { prefixes } from './sampo/SparqlQueriesPrefixes'
+import { prefixes } from '../sparql_queries/SparqlQueriesPrefixes'
export const perspective3Config = {
endpoint: {
--
GitLab