Author: knguyen
Date: Mon Aug 13 16:19:47 2007
New Revision: 11
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D11&repname=3D=
slide
Log:
synchronize slide to lucene 2.0.0 to make it works with Jahia SP branch
Added:
branches/SLIDE-386476/lib/lucene-analyzers-2.0.0.jar (with props)
branches/SLIDE-386476/lib/lucene-core-2.0.0.jar (with props)
branches/SLIDE-386476/lib/lucene-highlighter-2.0.0.jar (with props)
branches/SLIDE-386476/lib/lucene-snowball-2.0.0.jar (with props)
Removed:
branches/SLIDE-386476/lib/lucene-1.4-final.jar
Modified:
branches/SLIDE-386476/build.xml
branches/SLIDE-386476/src/share/org/apache/slide/search/basic/Comparabl=
eResourceImpl.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/BasicExpression=
TxtContainsSample.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/LuceneIndexer.j=
ava
branches/SLIDE-386476/src/stores/org/apache/slide/index/TextContainsExp=
ression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/TextContentInde=
xer.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/Index.ja=
va
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/AbstractLuceneExpression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/BetweenExpression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/ContainsExpression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/EqExpression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/LikeExpression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/MergeExpression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/PropcontainsExpression.java
branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/PropertyContainsExpression.java
Modified: branches/SLIDE-386476/build.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/build.xml&rev=3D11&repname=3Dslide
=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/SLIDE-386476/build.xml (original)
+++ branches/SLIDE-386476/build.xml Mon Aug 13 16:19:47 2007
@@ -45,7 +45,7 @@
<property name=3D"commons-collections.jar" value=3D"${lib.dir}/commons=
-collections-2.1.jar"/>
<property name=3D"commons-logging.jar" value=3D"${lib.dir}/commons-log=
ging-1.0.4.jar"/>
<property name=3D"commons-lang.jar" value=3D"${lib.dir}/commons-lang-2=
.0.jar"/>
- <property name=3D"lucene.jar" value=3D"${lib.dir}/lucene-1.4-final.jar=
"/>
+ <property name=3D"lucene.jar" value=3D"${lib.dir}/lucene-core-2.0.0.ja=
r"/>
<property name=3D"poi.jar" value=3D"${lib.dir}/poi-2.5-final-20040428.=
jar"/>
<property name=3D"pdfbox.jar" value=3D"${lib.dir}/PDFBox-0.6.5.jar"/>
<property name=3D"tm-extractors.jar" value=3D"${lib.dir}/tm-extractors=
-0.4.jar"/>
Added: branches/SLIDE-386476/lib/lucene-analyzers-2.0.0.jar
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/SLIDE=
-386476/lib/lucene-analyzers-2.0.0.jar&rev=3D11&repname=3Dslide
=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
Binary file - no diff available.
Added: branches/SLIDE-386476/lib/lucene-core-2.0.0.jar
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/SLIDE=
-386476/lib/lucene-core-2.0.0.jar&rev=3D11&repname=3Dslide
=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
Binary file - no diff available.
Added: branches/SLIDE-386476/lib/lucene-highlighter-2.0.0.jar
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/SLIDE=
-386476/lib/lucene-highlighter-2.0.0.jar&rev=3D11&repname=3Dslide
=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
Binary file - no diff available.
Added: branches/SLIDE-386476/lib/lucene-snowball-2.0.0.jar
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/SLIDE=
-386476/lib/lucene-snowball-2.0.0.jar&rev=3D11&repname=3Dslide
=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
Binary file - no diff available.
Modified: branches/SLIDE-386476/src/share/org/apache/slide/search/basic/Com=
parableResourceImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java&rev=3D=
11&repname=3Dslide
=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/SLIDE-386476/src/share/org/apache/slide/search/basic/Comparabl=
eResourceImpl.java (original)
+++ branches/SLIDE-386476/src/share/org/apache/slide/search/basic/Comparabl=
eResourceImpl.java Mon Aug 13 16:19:47 2007
@@ -49,6 +49,7 @@
import org.apache.slide.search.basic.Literals;
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.structure.ObjectNode;
+import org.apache.slide.util.logger.Logger;
=
/**
* Represents one Resource. Implements operators like greaterThan,
@@ -60,6 +61,7 @@
=
// TODO: properties with namespace...
=
+ static final String LOG_CHANNEL =3D "org.apache.slide.search.basic";
=
/** The ObjectNode of this resource */
private ObjectNode objectNode;
@@ -186,7 +188,12 @@
}
=
catch (Exception e) {
- e.printStackTrace();
+ if (this.searchToken.getNamespace().getLogger().isEnabled(LOG_=
CHANNEL, Logger.DEBUG)) {
+ this.searchToken.getNamespace().getLogger().log(
+ "exception creating resource ", e,
+ LOG_CHANNEL, Logger.DEBUG);
+ }
+ //e.printStackTrace();
throw new SlideException (e.getMessage()); // TODO: clean exce=
ption handling
}
}
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/BasicExpr=
essionTxtContainsSample.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/BasicExpressionTxtContainsSample.java&re=
v=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/BasicExpression=
TxtContainsSample.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/BasicExpression=
TxtContainsSample.java Mon Aug 13 16:19:47 2007
@@ -112,8 +112,8 @@
{
Searcher searcher =3D new IndexSearcher(indexPath);
Analyzer analyzer =3D new StandardAnalyzer();
- =
- Query query =3D QueryParser.parse(searchedText, "contents", an=
alyzer);
+ QueryParser queryParser =3D new QueryParser("contents",analyze=
r);
+ Query query =3D queryParser.parse(searchedText);
Hits hits =3D searcher.search (query);
int noOfHits =3D hits.length();
=
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/LuceneInd=
exer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/LuceneIndexer.java&rev=3D11&repname=3Dsl=
ide
=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/SLIDE-386476/src/stores/org/apache/slide/index/LuceneIndexer.j=
ava (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/LuceneIndexer.j=
ava Mon Aug 13 16:19:47 2007
@@ -81,7 +81,7 @@
IndexReader reader =3D IndexReader.open(directory);
=
Term deleteTerm =3D new Term(DOC_ID, docId);
- reader.delete(deleteTerm);
+ reader.deleteDocuments(deleteTerm);
reader.close();
directory.close();
}
@@ -104,8 +104,8 @@
// reader =3D new FileReader (docId);
=
Document doc =3D new Document();
- doc.add (Field.Text ("contents", reader));
- Field field =3D new Field(DOC_ID, docId, true, true, true);
+ doc.add (new Field("contents", reader));
+ Field field =3D new Field(DOC_ID, docId, Field.Store.YES, Field.In=
dex.TOKENIZED);
doc.add(field);
writer.addDocument(doc);
writer.optimize();
@@ -123,8 +123,8 @@
Set resultSet =3D new HashSet();
Searcher searcher =3D new IndexSearcher (indexDb);
Analyzer analyzer =3D new StandardAnalyzer();
- =
- Query query =3D QueryParser.parse(stringToFind, "contents", analyz=
er);
+ QueryParser queryParser =3D new QueryParser("contents",analyzer);
+ Query query =3D queryParser.parse(stringToFind);
=
Hits hits =3D searcher.search(query);
=
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/TextConta=
insExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/TextContainsExpression.java&rev=3D11&rep=
name=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/TextContainsExp=
ression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/TextContainsExp=
ression.java Mon Aug 13 16:19:47 2007
@@ -109,7 +109,8 @@
{
Searcher searcher =3D new IndexSearcher(indexPath);
=
- Query query =3D QueryParser.parse(searchedText, TextContentInd=
exer.CONTENT_TEXT, analyzer);
+ QueryParser queryParser =3D new QueryParser(TextContentIndexer=
.CONTENT_TEXT, analyzer);
+ Query query =3D queryParser.parse(searchedText);
Hits hits =3D searcher.search (query);
int noOfHits =3D hits.length();
=
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/TextConte=
ntIndexer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/TextContentIndexer.java&rev=3D11&repname=
=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/TextContentInde=
xer.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/TextContentInde=
xer.java Mon Aug 13 16:19:47 2007
@@ -140,14 +140,14 @@
// Create document
Document doc =3D new Document();
=
- doc.add(Field.Keyword(URI_FIELD, uri.toString()));
- doc.add(Field.Text(CONTENT_TEXT, readContent(revisionDescriptor, =
revisionContent)));
+ doc.add(new Field(URI_FIELD, uri.toString(), Field.Store.YES, Fie=
ld.Index.UN_TOKENIZED));
+ doc.add(new Field(CONTENT_TEXT, readContent(revisionDescriptor, r=
evisionContent)));
=
if ( revisionContent !=3D null && revisionDescriptor !=3D null ) {
List extractor =3D ExtractorManager.getInstance().getContentEx=
tractors(uri.getNamespace().getName(), (NodeRevisionDescriptors)null, revis=
ionDescriptor);
for ( int i =3D 0, l =3D extractor.size(); i < l; i++ ) {
Reader reader =3D ((ContentExtractor)extractor.get(i=
)).extract(new ByteArrayInputStream(revisionContent.getContentBytes()));
- doc.add(Field.Text(CONTENT_TEXT, reader));
+ doc.add(new Field(CONTENT_TEXT, reader));
}
}
=
@@ -207,7 +207,7 @@
IndexReader indexReader =3D IndexReader.open(indexpath);
Term term =3D new Term(URI_FIELD, uri.toString());
=
- indexReader.delete(term);
+ indexReader.deleteDocuments(term);
indexReader.close();
=
indexWriter =3D new IndexWriter(indexpath, analyzer, false);
@@ -215,14 +215,14 @@
// Create document
Document doc =3D new Document();
=
- doc.add(Field.Keyword(URI_FIELD, uri.toString()));
- doc.add(Field.Text(CONTENT_TEXT, readContent(revisionDescripto=
r, revisionContent)));
+ doc.add(new Field(URI_FIELD, uri.toString(), Field.Store.YES, =
Field.Index.UN_TOKENIZED));
+ doc.add(new Field(CONTENT_TEXT, readContent(revisionDescriptor=
, revisionContent)));
=
if ( revisionContent !=3D null && revisionDescriptor !=3D null=
) {
List extractor =3D ExtractorManager.getInstance().getContentE=
xtractors(uri.getNamespace().getName(), (NodeRevisionDescriptors)null, revi=
sionDescriptor);
for ( int i =3D 0, l =3D extractor.size(); i < l; i++ ) {
Reader reader =3D ((ContentExtractor)extractor.get(i)=
).extract(new ByteArrayInputStream(revisionContent.getContentBytes()));
- doc.add(Field.Text(CONTENT_TEXT, reader));
+ doc.add(new Field(CONTENT_TEXT, reader));
}
}
=
@@ -279,7 +279,7 @@
IndexReader indexReader =3D IndexReader.open(indexpath);
Term term =3D new Term(URI_FIELD, uri.toString());
=
- indexReader.delete(term);
+ indexReader.deleteDocuments(term);
indexReader.close();
=
indexWriter =3D new IndexWriter(indexpath, analyzer, false);
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/In=
dex.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/Index.java&rev=3D11&repname=3Dsli=
de
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/Index.ja=
va (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/Index.ja=
va Mon Aug 13 16:19:47 2007
@@ -80,6 +80,8 @@
=
public static final String NULL_FIELD_NAME =3D "SLIDE_NULL";
=
+ public static final String NAMESPACE =3D "SLIDE_NAMESPACE";
+
protected static final SimpleDateFormat DATE_INDEX_FORMAT =3D new
SimpleD=
ateFormat(
"yyyy-MM-dd HH:mm", Locale.UK);
=
@@ -215,19 +217,19 @@
}
=
private Field unstoredString(String fieldName, String value) {
- return new Field(fieldName, value, false, true, false);
+ return new Field(fieldName, value, Field.Store.NO,
Field.Index.UN_TOKENI=
ZED);
}
=
private Field storedString(String fieldName, String value) {
- return new Field(fieldName, value, true, true, false);
+ return new Field(fieldName, value, Field.Store.YES,
Field.Index.UN_TOKEN=
IZED);
}
=
private Field textField(String fieldName, String value) {
- return new Field(fieldName, value, false, true, true);
+ return new Field(fieldName, value, Field.Store.NO,
Field.Index.TOKENIZED=
);
}
=
private Field textField(String fieldName, Reader value) {
- return Field.Text(fieldName, value);
+ return new Field(fieldName, value);
}
=
/**
@@ -407,7 +409,7 @@
logger.log("remove: " +
job.key, LOG_CHANNEL,
Logger.DEBUG);
}
- reader.delete(new
Term(Index.KEY_FIELD_NAME, job.getKey()));
+ reader.deleteDocuments(new
Term(Index.KEY_FIELD_NAME, job.getKey()));
this.jobCounter++;
}
reader.close();
@@ -431,6 +433,7 @@
try {
doc =3D
createLuceneDocument(job.uri, job.descriptor,
job.content);
+ addNameSpace(doc);
writer.addDocument(doc);
} catch (ExtractorException e) {
logger.log("Error while
extracting content: "
@@ -443,6 +446,7 @@
LOG_CHANNEL, Logger.DEBUG);
}
doc =3D
createLuceneDocument(job.uri, job.descriptor);
+ addNameSpace(doc);
writer.addDocument(doc);
}
this.jobCounter++;
@@ -470,6 +474,13 @@
}
}
=
+ private void addNameSpace(Document doc){
+ if ( doc !=3D null ){
+ String nameSpace =3D this.configuration.getNamespaceName();
+ doc.add(this.textField(Index.NAMESPACE,nameSpace.toLowerCase()=
));
+ }
+ }
+
/**
* Creates an IndexJob for <em>property indexing</em>.
*/
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/AbstractLuceneExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/AbstractLuceneExpress=
ion.java&rev=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/AbstractLuceneExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/AbstractLuceneExpression.java Mon Aug 13 16:19:47 2007
@@ -33,14 +33,7 @@
=
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Hits;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RangeQuery;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.*;
=
import org.apache.slide.search.CompareHint;
import org.apache.slide.common.SlideException;
@@ -135,13 +128,14 @@
}
=
// add a scope restriction, this allows negated queries too
+ BooleanQuery.setMaxClauseCount(Integer.MAX_VALUE);
BooleanQuery booleanQuery =3D new BooleanQuery();
=
if (luceneQuery !=3D null)
- booleanQuery.add(luceneQuery, true, false);
+ booleanQuery.add(luceneQuery, BooleanClause.Occur.MUST);
if (Configuration.useGlobalBinding()) {
booleanQuery.add(new TermQuery(
- new Term(Index.SCOPE_FIELD_NAME, "/")),
true, false);
+ new Term(Index.SCOPE_FIELD_NAME, "/")),
BooleanClause.Occur.MUST);
booleanQuery
.add(
new RangeQuery(
@@ -157,10 +151,10 @@
+ q
.getScope()
.getDepth())),
- true),
true, false);
+ true),
BooleanClause.Occur.MUST);
} else {
booleanQuery.add(new TermQuery(new
Term(Index.SCOPE_FIELD_NAME,
- scope)), true, false);
+ scope)), BooleanClause.Occur.MUST);
=
int queryScopeHrefDepth =3D getDepth(scope);
=
@@ -171,7 +165,7 @@
case QueryScope.DEPTH_0:
booleanQuery.add(new TermQuery(new
Term(Index.DEPTH_FIELD_NAME,
index.getConfiguration().intToIndexString(
-
getDepth(scope)))), true, false);
+
getDepth(scope)))), BooleanClause.Occur.MUST);
break;
case QueryScope.DEPTH_1:
default:
@@ -182,7 +176,7 @@
.intToIndexString(
getDepth(scope)
+ q.getScope().getDepth())),
- true), true, false);
+ true),
BooleanClause.Occur.MUST);
=
}
}
@@ -246,10 +240,19 @@
// At least the INDEXED_BINDING_URI_IDENTIFIER
prefix should be
// added at indexing time
if (Configuration.useGlobalBinding()) {
+ try {
+ //@Todo : JAHIA_PATCH
resource =3D createResource(
BindingStore.INDEXED_BINDING_URI_IDENTIFIER
.substring(1)
+ uri,
nodeNumber);
+ } catch ( Throwable t ){
+ if (index.getLogger().isEnabled(LOG_CHANNEL, Logge=
r.DEBUG)) {
+ index.getLogger().log(
+ "exception creating resource: " + uri,
+ LOG_CHANNEL, Logger.DEBUG);
+ }
+ }
if (resource !=3D null) {
try {
NodeProperty
parentProperty =3D resource.getProperty(
@@ -292,7 +295,13 @@
}
}
} else {
+ try {
resource =3D createResource(uri,
nodeNumber);
+ } catch ( Throwable t ){
+ index.getLogger().log(
+ "exception creating
resource: " + uri,
+ LOG_CHANNEL,
Logger.DEBUG);
+ }
if (resource !=3D null) {
result.add(resource);
counter++;
@@ -325,8 +334,8 @@
=
protected Query negateQuery(Query query) {
BooleanQuery booleanQuery =3D new BooleanQuery();
- booleanQuery.add(allQuery(), true, false);
- booleanQuery.add(query, false, true);
+ booleanQuery.add(allQuery(), BooleanClause.Occur.MUST);
+ booleanQuery.add(query, BooleanClause.Occur.MUST_NOT);
return booleanQuery;
}
=
@@ -349,7 +358,6 @@
// resource =3D new ComparableResourceImpl(node,
// query.getSearchToken(),
// query.getScope(), factory.getPropertyProvider());
-
resource =3D new ComparableResourceImpl(node,
query.getSearchToken(),
query.getScope(),
factory.getPropertyProvider(), nodeNumber);
} catch (AccessDeniedException e) {
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/BetweenExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/BetweenExpression.jav=
a&rev=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/BetweenExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/BetweenExpression.java Mon Aug 13 16:19:47 2007
@@ -23,10 +23,7 @@
package org.apache.slide.index.lucene.expressions;
=
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RangeQuery;
-import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.*;
=
import org.apache.slide.index.lucene.Index;
import org.apache.slide.index.lucene.IndexConfiguration;
@@ -127,11 +124,9 @@
BooleanQuery booleanQuery =3D new BooleanQuery();
booleanQuery.add(
new TermQuery(new Term(Index.IS_DEFINED_FIELD_NAME, field)=
),
- true, // required
- false);
+ BooleanClause.Occur.MUST);
booleanQuery.add(getQuery(),
- false, =
- true); // prohibited
+ BooleanClause.Occur.MUST_NOT); // prohibited
setQuery(booleanQuery);
}
=
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/ContainsExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/ContainsExpression.ja=
va&rev=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/ContainsExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/ContainsExpression.java Mon Aug 13 16:19:47 2007
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.StringTokenizer;
=
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
@@ -34,6 +35,7 @@
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.WildcardQuery;
+import org.apache.lucene.queryParser.QueryParser;
=
import org.apache.slide.index.lucene.Index;
import org.apache.slide.index.lucene.IndexConfiguration;
@@ -78,26 +80,20 @@
=
private void termOrPhraseQuery(IndexConfiguration config, String field=
, String text)
{
- TokenStream ts =3D config.getAnalyzer().tokenStream(field,
- new StringReader(text));
-
- ArrayList tokens =3D new ArrayList(20);
- try {
- for (Token t =3D ts.next(); t !=3D null; t =3D ts.next()) {
- tokens.add(t.termText());
- }
- } catch (IOException e) {
- // should not happen, because we are reading from StringReader
- }
- =
- if (tokens.size() > 1) {
+ StringTokenizer strTokenizer =3D new StringTokenizer(text," ");
+ if ( strTokenizer.countTokens() > 1 ){
PhraseQuery phraseQuery =3D new PhraseQuery();
- for(int i =3D 0, l =3D tokens.size(); i<l; i++) {
- phraseQuery.add(new Term(field, (String)tokens.get(i)));
+ while ( strTokenizer.hasMoreTokens() ){
+ phraseQuery.add(new Term(field, strTokenizer.nextToken()));
}
setQuery(phraseQuery);
- } else if (tokens.size() =3D=3D 1) {
- setQuery(new TermQuery(new Term(field, (String)tokens.get(0)))=
);
+ } else if (strTokenizer.countTokens() =3D=3D 1) {
+ try {
+ QueryParser queryParser =3D new QueryParser(field,config.g=
etAnalyzer());
+ setQuery(queryParser.parse(strTokenizer.nextToken()));
+ } catch ( Throwable t ){
+ setQuery(new BooleanQuery());
+ }
} else {
// TODO NOP query???
setQuery(new BooleanQuery());
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/EqExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/EqExpression.java&rev=
=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/EqExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/EqExpression.java Mon Aug 13 16:19:47 2007
@@ -25,6 +25,7 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.BooleanClause;
=
import org.apache.slide.index.lucene.Index;
import org.apache.slide.index.lucene.IndexConfiguration;
@@ -66,9 +67,9 @@
BooleanQuery booleanQuery =3D new BooleanQuery();
booleanQuery.add(
new TermQuery(new Term(Index.IS_DEFINED_FIELD_NAME, fi=
eld)),
- true, false);
+ BooleanClause.Occur.MUST);
booleanQuery.add(getQuery(),
- false, true);
+ BooleanClause.Occur.MUST_NOT);
setQuery(booleanQuery);
}
}
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/LikeExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/LikeExpression.java&r=
ev=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/LikeExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/LikeExpression.java Mon Aug 13 16:19:47 2007
@@ -23,11 +23,7 @@
package org.apache.slide.index.lucene.expressions;
=
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.WildcardQuery;
-import org.apache.lucene.search.WildcardTermEnum;
+import org.apache.lucene.search.*;
=
import org.apache.slide.index.lucene.Index;
import org.apache.slide.index.lucene.IndexConfiguration;
@@ -68,11 +64,9 @@
BooleanQuery booleanQuery =3D new BooleanQuery();
booleanQuery.add(
new TermQuery(new Term(Index.IS_DEFINED_FIELD_NAME, fi=
eld)),
- true, // required
- false);
+ BooleanClause.Occur.MUST);
booleanQuery.add(getQuery(),
- false, =
- true); // prohibited
+ BooleanClause.Occur.MUST_NOT); // prohibited
setQuery(booleanQuery);
}
}
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/MergeExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/MergeExpression.java&=
rev=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/MergeExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/MergeExpression.java Mon Aug 13 16:19:47 2007
@@ -31,6 +31,7 @@
=
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.BooleanClause;
=
import org.apache.slide.index.lucene.Index;
=
@@ -65,7 +66,12 @@
Object e =3D i.next();
AbstractLuceneExpression expression =3D (AbstractLuceneExp=
ression)e;
Query q =3D expression.getQuery();
- booleanQuery.add(q, and, false);
+ if ( and ){
+ booleanQuery.add(q, BooleanClause.Occur.MUST);
+ } else {
+ booleanQuery.add(q, BooleanClause.Occur.SHOULD);
+ }
+
}
setQuery(booleanQuery);
} =
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/PropcontainsExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/PropcontainsExpressio=
n.java&rev=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/PropcontainsExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/PropcontainsExpression.java Mon Aug 13 16:19:47 2007
@@ -26,6 +26,7 @@
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.WildcardQuery;
+import org.apache.lucene.search.BooleanClause;
=
import org.apache.slide.index.lucene.Index;
import org.apache.slide.index.lucene.IndexConfiguration;
@@ -59,11 +60,9 @@
BooleanQuery booleanQuery =3D new BooleanQuery();
booleanQuery.add(
new TermQuery(new Term(Index.IS_DEFINED_FIELD_NAME, fi=
eld)),
- true, // required =
- false);
+ BooleanClause.Occur.MUST);
booleanQuery.add(getQuery(),
- false, =
- true); // prohibited
+ BooleanClause.Occur.MUST_NOT); // prohibited
setQuery(booleanQuery);
}
}
Modified: branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/ex=
pressions/PropertyContainsExpression.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/SLIDE-386476=
/src/stores/org/apache/slide/index/lucene/expressions/PropertyContainsExpre=
ssion.java&rev=3D11&repname=3Dslide
=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/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/PropertyContainsExpression.java (original)
+++ branches/SLIDE-386476/src/stores/org/apache/slide/index/lucene/expressi=
ons/PropertyContainsExpression.java Mon Aug 13 16:19:47 2007
@@ -29,11 +29,7 @@
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.WildcardQuery;
+import org.apache.lucene.search.*;
=
import org.apache.slide.index.lucene.Index;
import org.apache.slide.index.lucene.IndexConfiguration;
@@ -78,11 +74,9 @@
BooleanQuery booleanQuery =3D new BooleanQuery();
booleanQuery.add(
new TermQuery(new Term(Index.IS_DEFINED_FIELD_NAME, fi=
eld)),
- true, // required =
- false);
+ BooleanClause.Occur.MUST);
booleanQuery.add(getQuery(),
- false, =
- true); // prohibited
+ BooleanClause.Occur.MUST_NOT); // prohibited
setQuery(booleanQuery);
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
