inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-4155 We only index full category path in ES.

Browse Source
This commit is contained in:
Tom Page
2023-02-01 10:34:09 +00:00
parent 9e88a6562e
commit 22e8a506ff
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js
View File

@@ -241,7 +241,7 @@ var Filters =
filterData = filterData.slice(0, -1); filterData = filterData.slice(0, -1);
} }
filterQuery = this.constructPathQuery(parsedArgs); 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; break;
case "aspect": case "aspect":

2
amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js
View File

@@ -230,7 +230,7 @@ var Filters =
filterData = filterData.slice(0, -1); filterData = filterData.slice(0, -1);
} }
filterQuery = this.constructPathQuery(parsedArgs); 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; break;
default: // "path" default: // "path"

6
repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js
View File

@@ -1,5 +1,5 @@
// check category exists? // 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) if (category == undefined)
{ {
status.code = 404; status.code = 404;
@@ -9,6 +9,6 @@ if (category == undefined)
else else
{ {
// perform category search // 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; model.resultset = nodes;
} }

2
repository/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample
View File

@@ -34,7 +34,7 @@
<value>{http://www.alfresco.org/model/content/1.0}categories</value> <value>{http://www.alfresco.org/model/content/1.0}categories</value>
</key> </key>
<!-- Note - FreeMarker ${..} entries must be escaped in Spring context files --> <!-- Note - FreeMarker ${..} entries must be escaped in Spring context files -->
<value>\$\{selectSingleNode('workspace://SpacesStore', 'lucene', 'PATH:"/cm:generalclassifiable/cm:Languages/cm:English"' )\}</value> <value>\$\{selectSingleNode('workspace://SpacesStore', 'lucene', 'PATH:"/cm:categoryRoot/cm:generalclassifiable/cm:Languages/cm:English"' )\}</value>
</entry> </entry>
</map> </map>
</property> </property>

6
repository/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@@ -1220,7 +1220,7 @@ public class MultiTDemoTest extends TestCase
} }
// Find all root categories // 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); ResultSet resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query);
int cnt = resultSet.length(); int cnt = resultSet.length();
@@ -1246,7 +1246,7 @@ public class MultiTDemoTest extends TestCase
assertEquals(cnt, resultSet.length()); assertEquals(cnt, resultSet.length());
resultSet.close(); 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); resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, queryMembers);
assertEquals(0, resultSet.length()); assertEquals(0, resultSet.length());
resultSet.close(); resultSet.close();
@@ -1273,7 +1273,7 @@ public class MultiTDemoTest extends TestCase
assertEquals(1, categories.size()); assertEquals(1, categories.size());
// test ETHREEOH-210 // 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); resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, queryMembers);
assertEquals(1, resultSet.length()); assertEquals(1, resultSet.length());
resultSet.close(); resultSet.close();