URI filter: change order

src/server/sparql/FacetResults.js

@@ -126,6 +126,7 @@ export const getResultCount = async ({
       facetID: null
     }))
   }
+  // console.log(endpoint.prefixes + q)
   const response = await runSelectQuery({
     query: endpoint.prefixes + q,
     endpoint: endpoint.url,

src/server/sparql/Filters.js

@@ -253,17 +253,7 @@ const generateUriFilter = ({
   const facetConfig = backendSearchConfig[facetClass].facets[facetID]
   const includeChildren = facetConfig.type === 'hierarchical' && selectAlsoSubconcepts
   const literal = facetConfig.literal
-  const valuesStr = literal ? `"${values.join('" "')}"` : `<${values.join('> <')}></$>`
-  if (includeChildren) {
-    s = `
-         VALUES ?${facetID}Filter { ${valuesStr} }
-         ?${facetID}FilterWithChildren ${facetConfig.parentProperty}* ?${facetID}Filter .
-     `
-  } else {
-    s = `
-         VALUES ?${facetID}Filter { ${valuesStr} }
-     `
-  }
+  const valuesStr = literal ? `"${values.join('" "')}"` : `<${values.join('> <')}>`
   if (inverse) {
     s += `
        FILTER NOT EXISTS {
@@ -279,6 +269,16 @@ const generateUriFilter = ({
        ?${filterTarget} ${facetConfig.predicate} ${filterValue} .
      `
   }
+  if (includeChildren) {
+    s += `
+        VALUES ?${facetID}Filter { ${valuesStr} }
+        ?${facetID}FilterWithChildren ${facetConfig.parentProperty}* ?${facetID}Filter .
+     `
+  } else {
+    s += `
+        VALUES ?${facetID}Filter { ${valuesStr} }
+     `
+  }
   return s
 }