Author: bpapez
Date: Thu Aug 16 14:23:32 2007
New Revision: 18177
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18177&repname=
=3Djahia
Log:
use non-deprecated lucene methods
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/search/SearchEngi=
ne.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/search/Sear=
chEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/search/SearchEngine.java&rev=3D18177&repna=
me=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/search/SearchEngi=
ne.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/search/SearchEngi=
ne.java Thu Aug 16 14:23:32 2007
@@ -121,10 +121,10 @@
=
QueryParser parser =3D new SearchQueryParser(JahiaSearchConsta=
nt.FIELD_TEXT,
analyzer, doAutoAppendWildcards);
- parser.setOperator(QueryParser.DEFAULT_OPERATOR_AND); =
=
+ parser.setDefaultOperator(QueryParser.Operator.AND); =
=
=
BooleanQuery resultQuery =3D new BooleanQuery();
- resultQuery.add(parser.parse(jSearcher.getQuery()), true, fals=
e);
+ resultQuery.add(parser.parse(jSearcher.getQuery()), BooleanCla=
use.Occur.MUST);
appendLanguageAndStateQuery(resultQuery, jSearcher, jParams);
=
int[] siteIds =3D jSearcher.getSiteIds();
@@ -188,10 +188,10 @@
//SCSE: bug fix NOV0095: use AND as the default conjunction op=
erator
QueryParser parser =3D new SearchQueryParser(JahiaSearchConsta=
nt.FIELD_TEXT,
analyzer, doAutoAppendWildcards);
- parser.setOperator(QueryParser.DEFAULT_OPERATOR_AND); =
=
+ parser.setDefaultOperator(QueryParser.Operator.AND); =
=
=
BooleanQuery resultQuery =3D new BooleanQuery();
- resultQuery.add(parser.parse(cSearcher.getQuery()), true, fals=
e);
+ resultQuery.add(parser.parse(cSearcher.getQuery()), BooleanCla=
use.Occur.MUST);
appendLanguageAndStateQuery(resultQuery, jSearcher, jParams);
=
if (!cSearcher.isSiteModeSearching ()) {
@@ -206,24 +206,24 @@
for (Iterator iter =3D ctnids.iterator(); iter.hasNext();)
{
containerQuery.add(new TermQuery(new Term(
- JahiaSearchConstant.FIELD_CTNID, iter.next().toString(=
))), false,
- false);
+ JahiaSearchConstant.FIELD_CTNID, iter.next().toString(=
))), =
+ BooleanClause.Occur.SHOULD);
}
=
- resultQuery.add(containerQuery, true, false);
+ resultQuery.add(containerQuery, BooleanClause.Occur.MUST);
} else {
=
if (cSearcher.getSiteId () !=3D -1) {
resultQuery.add(new TermQuery(new Term(
JahiaSearchConstant.FIELD_JAHIAID, String.valueOf(cSea=
rcher
- .getSiteId()))), true, false);
+ .getSiteId()))), BooleanClause.Occur.MUST);
}
=
if (cSearcher.getContainerDefinitionName () !=3D null
&& !"".equals (cSearcher.getContainerDefinitionNam=
e().trim ())) {
resultQuery.add(new TermQuery(new Term(
JahiaSearchConstant.CONTAINER_DEFINITION_NAME, cSearch=
er
- .getContainerDefinitionName().toLowerCase())), true,=
false);
+ .getContainerDefinitionName().toLowerCase())), Boole=
anClause.Occur.MUST);
}
}
=
@@ -319,7 +319,7 @@
{
query.add(new TermQuery(new Term(
JahiaSearchConstant.FIELD_WORKFLOW_STATE, String
- .valueOf(EntryLoadRequest.ACTIVE_WORKFLOW_STATE))), true, fals=
e);
+ .valueOf(EntryLoadRequest.ACTIVE_WORKFLOW_STATE))), BooleanCla=
use.Occur.MUST);
}
=
if (!jSearcher.getLanguageCodes().isEmpty())
@@ -328,7 +328,7 @@
BooleanQuery languageQuery =3D new BooleanQuery();
languageQuery.add(
new TermQuery(new Term(JahiaSearchConstant.FIELD_LANGUAGE_CODE,
- ContentField.SHARED_LANGUAGE)), false, false);
+ ContentField.SHARED_LANGUAGE)), BooleanClause.Occur.SHOULD);
=
Set lngSet =3D new HashSet();
lngSet.add(ContentField.SHARED_LANGUAGE);
@@ -340,12 +340,12 @@
if (!lngSet.contains(lng))
{
languageQuery.add(new TermQuery(new Term(
- JahiaSearchConstant.FIELD_LANGUAGE_CODE, lng)), false, false=
);
+ JahiaSearchConstant.FIELD_LANGUAGE_CODE, lng)), BooleanClaus=
e.Occur.SHOULD);
lngSet.add(lng);
}
}
=
- query.add(languageQuery, true, false);
+ query.add(languageQuery, BooleanClause.Occur.MUST);
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
