mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Fix parsing of stop words to a null query to generate an approriate non matching query
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -181,6 +181,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -194,6 +198,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -418,6 +426,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -431,6 +443,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -497,6 +513,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -630,6 +650,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -659,6 +683,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -688,6 +716,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
query.add(part, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
query.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return query;
|
||||
}
|
||||
@@ -826,6 +858,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
booleanQuery.add(subQuery, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
booleanQuery.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
return booleanQuery;
|
||||
}
|
||||
@@ -871,6 +907,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
subQuery.add(localeQuery, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
subQuery.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -879,6 +919,10 @@ public class LuceneQueryParser extends QueryParser
|
||||
{
|
||||
subQuery.add(localeQuery, Occur.SHOULD);
|
||||
}
|
||||
else
|
||||
{
|
||||
subQuery.add(new TermQuery(new Term("NO_TOKENS", "__")), Occur.SHOULD);
|
||||
}
|
||||
}
|
||||
}
|
||||
booleanQuery.add(subQuery, Occur.MUST);
|
||||
@@ -887,13 +931,29 @@ public class LuceneQueryParser extends QueryParser
|
||||
}
|
||||
else
|
||||
{
|
||||
return subQueryBuilder.getQuery(expandedFieldName, queryText);
|
||||
Query query = subQueryBuilder.getQuery(expandedFieldName, queryText);
|
||||
if(query != null)
|
||||
{
|
||||
return query;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new TermQuery(new Term("NO_TOKENS", "__"));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
return subQueryBuilder.getQuery(expandedFieldName, queryText);
|
||||
Query query = subQueryBuilder.getQuery(expandedFieldName, queryText);
|
||||
if(query != null)
|
||||
{
|
||||
return query;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new TermQuery(new Term("NO_TOKENS", "__"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user