From 618ff2aa665f01494dd2cc92058e65a1526f79fc Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Mon, 15 Feb 2021 12:34:52 +0200
Subject: [PATCH] Clean up
---
.../sitemap_generator/SitemapGenerator.js | 51 ++++++++++---------
.../sparql/sampo/BackendSearchConfig.js | 2 +
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/server/sitemap_generator/SitemapGenerator.js b/src/server/sitemap_generator/SitemapGenerator.js
index 6a430ef7..39540f95 100644
--- a/src/server/sitemap_generator/SitemapGenerator.js
+++ b/src/server/sitemap_generator/SitemapGenerator.js
@@ -11,6 +11,31 @@ import { runSelectQuery } from '../sparql/SparqlApi'
const { sitemapConfig } = backendSearchConfig
+const resultClasses = [] // gather portal specific configs for sitemap here
+
+for (let [resultClass, config] of Object.entries(backendSearchConfig)) {
+ if (config.includeInSitemap) {
+ let rdfType
+ let hasSearchPerspective
+ const instancePageDefaultTab = config.instance.defaultTab || 'table'
+ if (!has(config, 'facetClass')) {
+ rdfType = config.rdfType
+ config = backendSearchConfig[config.perspectiveID]
+ hasSearchPerspective = false
+ } else {
+ rdfType = config.facetClass
+ hasSearchPerspective = true
+ }
+ resultClasses.push({
+ endpoint: config.endpoint,
+ perspectiveID: resultClass,
+ hasSearchPerspective,
+ rdfType,
+ instancePageDefaultTab
+ })
+ }
+}
+
const mapURLs = sparqlBindings => {
const results = sparqlBindings.map(b => {
return createSitemapEntry({ path: b.path.value })
@@ -75,31 +100,6 @@ const queryInstancePageURLs = config => {
})
}
-const resultClasses = []
-
-for (let [resultClass, config] of Object.entries(backendSearchConfig)) {
- if (config.includeInSitemap) {
- let rdfType
- let hasSearchPerspective
- const instancePageDefaultTab = config.instance.defaultTab || 'table'
- if (!has(config, 'facetClass')) {
- rdfType = config.rdfType
- config = backendSearchConfig[config.perspectiveID]
- hasSearchPerspective = false
- } else {
- rdfType = config.facetClass
- hasSearchPerspective = true
- }
- resultClasses.push({
- endpoint: config.endpoint,
- perspectiveID: resultClass,
- hasSearchPerspective,
- rdfType,
- instancePageDefaultTab
- })
- }
-}
-
const createSitemapEntry = ({ path }) => {
path = path ? `/${path}` : '' // do not add trailing slash
const entry = {
@@ -112,4 +112,5 @@ const createSitemapEntry = ({ path }) => {
return entry
}
+// generate sitemap
getURLs(resultClasses)
diff --git a/src/server/sparql/sampo/BackendSearchConfig.js b/src/server/sparql/sampo/BackendSearchConfig.js
index ffc0df91..aa7141f2 100644
--- a/src/server/sparql/sampo/BackendSearchConfig.js
+++ b/src/server/sparql/sampo/BackendSearchConfig.js
@@ -79,6 +79,8 @@ export const backendSearchConfig = {
},
works: {
perspectiveID: 'perspective1',
+ rdfType: 'frbroo:F1_Work',
+ includeInSitemap: true,
instance: {
properties: workProperties,
relatedInstances: ''
--
GitLab