Skip to content
Snippets Groups Projects
Commit 9875b18d authored by Henrik Askjer's avatar Henrik Askjer
Browse files

use correct endpoint

parent e720fd56
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
}, },
"datasets": { "datasets": {
"nsdb": { "nsdb": {
"endpoint": "https://sd-33591800.stardog.cloud:5820/archive/query", "endpoint": "https://sd-33591800.stardog.cloud:5820/nos-hs/query",
"selected": true, "selected": true,
"useAuth": true "useAuth": true
}, },
......
...@@ -4,20 +4,22 @@ import { ...@@ -4,20 +4,22 @@ import {
} from './Mappers' } from './Mappers'
const getResults = async (federatedSearchDatasets, queryTerm, latMin, longMin, latMax, longMax, datasetId, resultFormat) => { const getResults = async (federatedSearchDatasets, queryTerm, latMin, longMin, latMax, longMax, datasetId, resultFormat) => {
const { endpoint, resultQuery } = federatedSearchDatasets[datasetId] const { endpoint, useAuth, resultQuery } = federatedSearchDatasets[datasetId]
let query = '' let query = ''
if (datasetId !== 'tgn') { if (datasetId !== 'tgn') {
if (queryTerm !== '') { if (queryTerm !== '') {
query = resultQuery.replace('<QUERY>', `?id rdfs:label/<tag:stardog:api:search:> '${queryTerm.toLowerCase()}' .`) query = resultQuery.replace('<QUERY>', `?id rdfs:label/<tag:stardog:api:property:textMatch> '${queryTerm.toLowerCase()}' .`)
} else if (latMin !== 0) { } else if (latMin !== 0) {
query = resultQuery.replace('<QUERY>', `?id spatial:withinBox (${latMin} ${longMin} ${latMax} ${longMax} 1000000) .`) query = resultQuery.replace('<QUERY>', `?id spatial:withinBox (${latMin} ${longMin} ${latMax} ${longMax} 1000000) .`)
} }
} else { } else {
query = resultQuery.replace(/<QUERYTERM>/g, queryTerm.toLowerCase()) query = resultQuery.replace(/<QUERYTERM>/g, queryTerm.toLowerCase())
} }
console.log("QUERY", query)
return runSelectQuery({ return runSelectQuery({
query, query,
endpoint, endpoint,
useAuth,
resultMapper: mapNameSampoResults, resultMapper: mapNameSampoResults,
resultFormat resultFormat
}) })
......
...@@ -16,11 +16,12 @@ export const runSelectQuery = async ({ ...@@ -16,11 +16,12 @@ export const runSelectQuery = async ({
: 'text/csv; charset=utf-8' : 'text/csv; charset=utf-8'
const headers = { const headers = {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
Accept: 'application/sparql-results+json' 'Accept': 'application/sparql-results+json'
} }
if (useAuth) { if (useAuth) {
headers.Authorization = `Basic ${process.env.SPARQL_ENDPOINT_BASIC_AUTH}` headers.Authorization = `Basic ${process.env.SPARQL_ENDPOINT_BASIC_AUTH}`
} }
console.log("HEADERS", headers)
const q = querystring.stringify({ query }) const q = querystring.stringify({ query })
try { try {
const response = await axios({ const response = await axios({
...@@ -30,6 +31,7 @@ export const runSelectQuery = async ({ ...@@ -30,6 +31,7 @@ export const runSelectQuery = async ({
data: q data: q
}) })
if (resultFormat === 'json') { if (resultFormat === 'json') {
console.log("JSON DATA", response.data)
let mappedResults = resultMapperConfig let mappedResults = resultMapperConfig
? resultMapper({ sparqlBindings: response.data.results.bindings, config: resultMapperConfig }) ? resultMapper({ sparqlBindings: response.data.results.bindings, config: resultMapperConfig })
: resultMapper(response.data.results.bindings) : resultMapper(response.data.results.bindings)
...@@ -41,6 +43,7 @@ export const runSelectQuery = async ({ ...@@ -41,6 +43,7 @@ export const runSelectQuery = async ({
sparqlQuery: query sparqlQuery: query
} }
} else { } else {
console.log("DATA", data)
return response.data return response.data
} }
} catch (error) { } catch (error) {
......
...@@ -2,11 +2,12 @@ export const federatedSearchSparqlQueries = { ...@@ -2,11 +2,12 @@ export const federatedSearchSparqlQueries = {
nsdb: { nsdb: {
resultQuery: ` resultQuery: `
PREFIX crm: <http://www.cidoc-crm.org/cidoc-crm/> PREFIX crm: <http://www.cidoc-crm.org/cidoc-crm/>
SELECT ?id ?prefLabel WHERE { SELECT ?id ?prefLabel WHERE { GRAPH <https://data.spraksamlingane.no/stadnamn/nos-hs/nsdb> {
<QUERY>
?id crm:P1i_identifies ?place ; ?id crm:P1i_identifies ?place ;
rdfs:label ?prefLabel . rdfs:label ?prefLabel .
}
} }
` `
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment