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

Merge pull request #7 from Alfresco/fix-search-556

Browse Source 
Implement fix to handle negation edge case
This commit is contained in:
Michael
2017-11-30 16:55:23 +00:00
committed by GitHub
parent 4b6e8ea146 32becdd4c6
commit 1ea8911e29
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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);
} }

5
src/test/resources/org/alfresco/repo/search/impl/parsers/fts_test.gunit
View File

@@ -180,6 +180,7 @@ ftsTest:
"*woof*woof*" ->"(TERM *woof*woof*)" "*woof*woof*" ->"(TERM *woof*woof*)"
"cm:content.mimetype:*" -> "(TERM * (FIELD_REF content.mimetype (PREFIX cm)))" "cm:content.mimetype:*" -> "(TERM * (FIELD_REF content.mimetype (PREFIX cm)))"
ftsTermOrPhrase: ftsTermOrPhrase:
"name:woof" -> "(TERM woof (FIELD_REF name))" "name:woof" -> "(TERM woof (FIELD_REF name))"
"cm_name:woof" -> "(TERM woof (FIELD_REF cm_name))" "cm_name:woof" -> "(TERM woof (FIELD_REF cm_name))"
@@ -223,7 +224,9 @@ ftsFieldGroupTest:
"[12 TO 14]" -> "(FG_RANGE INCLUSIVE 12 14 INCLUSIVE)" "[12 TO 14]" -> "(FG_RANGE INCLUSIVE 12 14 INCLUSIVE)"
"<12 TO 14>" -> "(FG_RANGE EXCLUSIVE 12 14 EXCLUSIVE)" "<12 TO 14>" -> "(FG_RANGE EXCLUSIVE 12 14 EXCLUSIVE)"
"(apple cheese and (pear or banana or not orange))" -> "(FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM apple)) (FIELD_DEFAULT (FG_TERM cheese)) (FIELD_DEFAULT (FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM pear))) (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM banana))) (FIELD_CONJUNCTION (FIELD_NEGATION (FG_TERM orange)))))))" "(apple cheese and (pear or banana or not orange))" -> "(FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM apple)) (FIELD_DEFAULT (FG_TERM cheese)) (FIELD_DEFAULT (FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM pear))) (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM banana))) (FIELD_CONJUNCTION (FIELD_NEGATION (FG_TERM orange)))))))"
"(apple chesse and banana)" -> (FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM apple)) (FIELD_DEFAULT (FG_TERM chesse)) (FIELD_DEFAULT (FG_TERM banana))))
"(apple chesse and not banana)" -> (FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM apple)) (FIELD_DEFAULT (FG_TERM chesse)) (FIELD_NEGATION (FG_TERM banana))))
"(apple chesse and (not banana))" -> (FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_DEFAULT (FG_TERM apple)) (FIELD_DEFAULT (FG_TERM chesse)) (FIELD_DEFAULT (FIELD_DISJUNCTION (FIELD_CONJUNCTION (FIELD_NEGATION (FG_TERM banana)))))))
ftsFieldGroupTerm: ftsFieldGroupTerm:
"woof" -> "woof" "woof" -> "woof"