From 2092e46cc7b8c660706428ef6b0337d8be3e7f33 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Fri, 31 Jan 2020 19:26:28 +0200
Subject: [PATCH] Move endpoint to config file
---
src/server/sparql/FacetConfigsSampo.js | 3 +++
src/server/sparql/FacetResults.js | 3 +--
src/server/sparql/FacetValues.js | 3 +--
src/server/sparql/SparqlQueriesGeneral.js | 3 ---
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/server/sparql/FacetConfigsSampo.js b/src/server/sparql/FacetConfigsSampo.js
index bc46592c..b81bcb6f 100644
--- a/src/server/sparql/FacetConfigsSampo.js
+++ b/src/server/sparql/FacetConfigsSampo.js
@@ -1,3 +1,6 @@
+export const endpoint = 'http://ldf.fi/mmm/sparql'
+// export const endpoint = 'http://localhost:3050/ds/sparql';
+
/* TODO:
labelPath is only used when sorting results, so it should removed from
facet configs
diff --git a/src/server/sparql/FacetResults.js b/src/server/sparql/FacetResults.js
index 1887a597..4a18acef 100644
--- a/src/server/sparql/FacetResults.js
+++ b/src/server/sparql/FacetResults.js
@@ -2,7 +2,6 @@ import { runSelectQuery } from './SparqlApi'
import { runNetworkQuery } from './NetworkApi'
import { prefixes } from './SparqlQueriesPrefixes'
import {
- endpoint,
countQuery,
facetResultSetQuery,
instanceQuery
@@ -27,7 +26,7 @@ import {
actorsAt,
allPlacesQuery
} from './SparqlQueriesPlaces'
-import { facetConfigs } from './FacetConfigsSampo'
+import { facetConfigs, endpoint } from './FacetConfigsSampo'
import { mapCount, mapPlaces } from './Mappers'
import { makeObjectList } from './SparqlObjectMapper'
import { generateConstraintsBlock } from './Filters'
diff --git a/src/server/sparql/FacetValues.js b/src/server/sparql/FacetValues.js
index bf539828..0f4d5211 100644
--- a/src/server/sparql/FacetValues.js
+++ b/src/server/sparql/FacetValues.js
@@ -1,13 +1,12 @@
import { runSelectQuery } from './SparqlApi'
import { has } from 'lodash'
import {
- endpoint,
facetValuesQuery,
facetValuesQueryTimespan,
facetValuesRange
} from './SparqlQueriesGeneral'
import { prefixes } from './SparqlQueriesPrefixes'
-import { facetConfigs } from './FacetConfigsSampo'
+import { facetConfigs, endpoint } from './FacetConfigsSampo'
import {
hasPreviousSelections,
hasPreviousSelectionsFromOtherFacets,
diff --git a/src/server/sparql/SparqlQueriesGeneral.js b/src/server/sparql/SparqlQueriesGeneral.js
index 88c19b84..c2d25642 100644
--- a/src/server/sparql/SparqlQueriesGeneral.js
+++ b/src/server/sparql/SparqlQueriesGeneral.js
@@ -1,6 +1,3 @@
-export const endpoint = 'http://ldf.fi/mmm/sparql'
-// export const endpoint = 'http://localhost:3050/ds/sparql';
-
export const instanceQuery = `
SELECT * {
BIND(<ID> as ?id)
--
GitLab