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

Datamodel fix for SEARCH-312 Support query templates in the CONTAINS() clause of CMIS QL

Browse Source 
MNT-14506     Templates ignored for CMIS queries
This commit is contained in:
ahind
2017-04-20 14:30:31 +01:00
parent 81f00d00a5
commit 2fca7b09ce
3 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/alfresco/opencmis/search/CMISQueryOptions.java
View File

@@ -82,6 +82,11 @@ public class CMISQueryOptions extends QueryOptions
options.setBulkFetchEnabled(searchParameters.isBulkFetchEnabled());
options.setExcludeTenantFilter(searchParameters.getExcludeTenantFilter());
options.setSinceTxId(searchParameters.getSinceTxId());
for(String name : searchParameters.getQueryTemplates().keySet())
{
String template = searchParameters.getQueryTemplates().get(name);
options.addQueryTemplate(name, template);
}
return options;
}
@@ -188,6 +193,11 @@ public class CMISQueryOptions extends QueryOptions
searchParameters.setBulkFetchEnabled(isBulkFetchEnabled());
searchParameters.setQueryConsistency(this.getQueryConsistency());
searchParameters.setSinceTxId(getSinceTxId());
for(String name : getQueryTemplates().keySet())
{
String template = getQueryTemplates().get(name);
searchParameters.addQueryTemplate(name, template);
}
return searchParameters;
}
}

2
src/main/java/org/alfresco/opencmis/search/CMISQueryParser.java
View File

@@ -477,7 +477,7 @@ public class CMISQueryParser
} else
{
ftsConstraint = FTSQueryParser.buildFTS(ftsExpression, factory, functionEvaluationContext, selector,
columnMap, mode, defaultFieldConnective, null, options.getDefaultFieldName(), FTSQueryParser.RerankPhase.SINGLE_PASS);
columnMap, mode, defaultFieldConnective, options.getQueryTemplates(), options.getDefaultFieldName(), FTSQueryParser.RerankPhase.SINGLE_PASS);
}
ftsConstraint.setBoost(1000.0f);
hasContains = true;

44
src/main/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java
View File

@@ -26,8 +26,10 @@
package org.alfresco.repo.search.impl.querymodel;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import org.alfresco.repo.search.MLAnalysisMode;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -90,6 +92,8 @@ public class QueryOptions
private Long sinceTxId;
private Map<String, String> queryTemplates = new HashMap<String, String>();
public static QueryOptions create(SearchParameters searchParameters)
{
QueryOptions options = new QueryOptions(searchParameters.getQuery(), null);
@@ -119,9 +123,17 @@ public class QueryOptions
options.setExcludeTenantFilter(searchParameters.getExcludeTenantFilter());
options.setQueryConsistency(searchParameters.getQueryConsistency());
options.setSinceTxId(searchParameters.getSinceTxId());
for(String name : searchParameters.getQueryTemplates().keySet())
{
String template = searchParameters.getQueryTemplates().get(name);
options.addQueryTemplate(name, template);
}
return options;
}
/**
/**
* Create a CMISQueryOptions instance with the default options other than the query and store ref. The query will be
* run using the locale returned by I18NUtil.getLocale()
*
@@ -505,6 +517,30 @@ public class QueryOptions
{
this.sinceTxId = sinceTxId;
}
/**
* Get the query templates
*
* @return - the query templates
*/
public Map<String, String> getQueryTemplates()
{
return queryTemplates;
}
/**
* Add/replace a query template Not all languages support query templates
*
* @param name String
* @param template String
* @return any removed template or null
*/
public String addQueryTemplate(String name, String template)
{
return queryTemplates.put(name, template);
}
/**
* @return SearchParameters
@@ -548,6 +584,12 @@ public class QueryOptions
//searchParameters.addTextAttribute()
searchParameters.setQueryConsistency(this.getQueryConsistency());
searchParameters.setSinceTxId(getSinceTxId());
for(String name : getQueryTemplates().keySet())
{
String template = getQueryTemplates().get(name);
searchParameters.addQueryTemplate(name, template);
}
return searchParameters;
}