From 22e8a506ff2595a3d0ed81f22a9fd51ab4540734 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 1 Feb 2023 10:34:09 +0000 Subject: [PATCH] ACS-4155 We only index full category path in ES. --- .../alfresco/slingshot/documentlibrary-v2/filters.lib.js | 2 +- .../org/alfresco/slingshot/documentlibrary/filters.lib.js | 2 +- .../alfresco/bootstrap/webscripts/categorysearch.get.js | 6 +++--- .../extension/scheduled-action-services-context.xml.sample | 2 +- .../test/java/org/alfresco/repo/tenant/MultiTDemoTest.java | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js index 8d1c096d50..0dad0bbc46 100644 --- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js +++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js @@ -241,7 +241,7 @@ var Filters = filterData = filterData.slice(0, -1); } filterQuery = this.constructPathQuery(parsedArgs); - filterParams.query = filterQuery + " +PATH:\"/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\""; + filterParams.query = filterQuery + " +PATH:\"/cm:categoryRoot/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\""; break; case "aspect": diff --git a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js index feb46270f6..922a84ff7c 100644 --- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js +++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js @@ -230,7 +230,7 @@ var Filters = filterData = filterData.slice(0, -1); } filterQuery = this.constructPathQuery(parsedArgs); - filterParams.query = filterQuery + " +PATH:\"/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\""; + filterParams.query = filterQuery + " +PATH:\"/cm:categoryRoot/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\""; break; default: // "path" diff --git a/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js index 20f88b7da3..f4099ce0d2 100644 --- a/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js +++ b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js @@ -1,5 +1,5 @@ // check category exists? -var category = search.luceneSearch("PATH:\"/cm:generalclassifiable//cm:" + url.extension + "\""); +var category = search.luceneSearch("PATH:\"/cm:categoryRoot/cm:generalclassifiable//cm:" + url.extension + "\""); if (category == undefined) { status.code = 404; @@ -9,6 +9,6 @@ if (category == undefined) else { // perform category search - var nodes = search.luceneSearch("PATH:\"/cm:generalclassifiable//cm:" + url.extension + "//member\""); + var nodes = search.luceneSearch("PATH:\"/cm:categoryRoot/cm:generalclassifiable//cm:" + url.extension + "//member\""); model.resultset = nodes; -} \ No newline at end of file +} diff --git a/repository/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample b/repository/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample index 1a24eb50ad..e290eca2f1 100644 --- a/repository/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample +++ b/repository/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample @@ -34,7 +34,7 @@ {http://www.alfresco.org/model/content/1.0}categories - \$\{selectSingleNode('workspace://SpacesStore', 'lucene', 'PATH:"/cm:generalclassifiable/cm:Languages/cm:English"' )\} + \$\{selectSingleNode('workspace://SpacesStore', 'lucene', 'PATH:"/cm:categoryRoot/cm:generalclassifiable/cm:Languages/cm:English"' )\} diff --git a/repository/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java b/repository/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java index 1c7cc0dfbb..6bff82ce8b 100644 --- a/repository/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java +++ b/repository/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java @@ -1220,7 +1220,7 @@ public class MultiTDemoTest extends TestCase } // Find all root categories - String query = "PATH:\"/cm:generalclassifiable/*\""; + String query = "PATH:\"/cm:categoryRoot/cm:generalclassifiable/*\""; ResultSet resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query); int cnt = resultSet.length(); @@ -1246,7 +1246,7 @@ public class MultiTDemoTest extends TestCase assertEquals(cnt, resultSet.length()); resultSet.close(); - String queryMembers = "PATH:\"/cm:generalclassifiable//cm:catA/member\""; + String queryMembers = "PATH:\"/cm:categoryRoot/cm:generalclassifiable//cm:catA/member\""; resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, queryMembers); assertEquals(0, resultSet.length()); resultSet.close(); @@ -1273,7 +1273,7 @@ public class MultiTDemoTest extends TestCase assertEquals(1, categories.size()); // test ETHREEOH-210 - queryMembers = "PATH:\"/cm:generalclassifiable//cm:CatA/member\""; + queryMembers = "PATH:\"/cm:categoryRoot/cm:generalclassifiable//cm:CatA/member\""; resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, queryMembers); assertEquals(1, resultSet.length()); resultSet.close();