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

Revert "Fix/acs 2699 mandatory modifier (#1472)" (#1520)

Browse Source 
[ACS-3854] This reverts commit 75acf5110e.
This commit is contained in:
Elia Porciani
2022-10-25 14:16:26 +02:00
committed by GitHub
parent 105702bf09
commit 32a524eb1f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryParser.java
View File

@@ -346,7 +346,7 @@ public class FTSQueryParser
} }
constraints.add(constraint); constraints.add(constraint);
} }
if (constraints.size() == 1) if (constraints.size() == 1 && Occur.EXCLUDE != constraints.get(0).getOccur())
{ {
return constraints.get(0); return constraints.get(0);
} }

11
data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneDisjunction.java
View File

@@ -69,20 +69,21 @@ public class LuceneDisjunction<Q, S, E extends Throwable> extends BaseDisjunctio
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
LuceneQueryBuilderComponent<Q, S, E> luceneQueryBuilderComponent = (LuceneQueryBuilderComponent<Q, S, E>) constraint; LuceneQueryBuilderComponent<Q, S, E> luceneQueryBuilderComponent = (LuceneQueryBuilderComponent<Q, S, E>) constraint;
Q constraintQuery = luceneQueryBuilderComponent.addComponent(selectors, functionArgs, luceneContext, functionContext); Q constraintQuery = luceneQueryBuilderComponent.addComponent(selectors, functionArgs, luceneContext, functionContext);
queriestoDisjoin.add(new Pair<>(constraint, constraintQuery)); queriestoDisjoin.add(new Pair<Constraint, Q>(constraint, constraintQuery));
if (constraintQuery != null) if (constraintQuery != null)
{ {
switch (constraint.getOccur()) switch (constraint.getOccur())
{ {
case DEFAULT: case DEFAULT:
case MANDATORY:
case OPTIONAL: case OPTIONAL:
expressionBuilder.addOptional(constraintQuery, constraint.getBoost()); expressionBuilder.addOptional(constraintQuery, constraint.getBoost());
break; break;
case MANDATORY:
expressionBuilder.addRequired(constraintQuery, constraint.getBoost());
break;
case EXCLUDE: case EXCLUDE:
expressionBuilder.addExcluded(constraintQuery, constraint.getBoost()); QueryParserExpressionAdaptor<Q, E> subExpressionBuilder = luceneContext.getLuceneQueryParserAdaptor().getExpressionAdaptor();
subExpressionBuilder.addRequired(luceneContext.getLuceneQueryParserAdaptor().getMatchAllNodesQuery());
subExpressionBuilder.addExcluded(constraintQuery);
expressionBuilder.addOptional(subExpressionBuilder.getQuery(), constraint.getBoost());
break; break;
} }
} }