knguyen 2005/03/03 13:27:00 CET
Modified files:
core/src/java/org/jahia/services/search ContainerSearcher.java
DocumentField.java
PageSearchResultBuilderImpl.java
PageSearcher.java
ParsedObject.java
ParsedObjectImpl.java
core/src/java/org/jahia/services/search/lucene
LuceneSearchIndexer.java
Removed files:
core/src/java/org/jahia/services/search AddedField.java
JahiaSearchIndexableDocument.java
JahiaSearchIndexableDocumentImpl.java
RemovedField.java
Log:
- removing old classes and change in hits build
Revision Changes Path
1.8 +0 -498
jahia/core/src/java/org/jahia/services/search/AddedField.java (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/AddedField.java?rev=1.7&content-type=text/plain
1.4 +4 -2
jahia/core/src/java/org/jahia/services/search/ContainerSearcher.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/ContainerSearcher.java.diff?r1=1.3&r2=1.4&f=h
1.2 +1 -1
jahia/core/src/java/org/jahia/services/search/DocumentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/DocumentField.java.diff?r1=1.1&r2=1.2&f=h
1.2 +0 -158
jahia/core/src/java/org/jahia/services/search/JahiaSearchIndexableDocument.java
(dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/JahiaSearchIndexableDocument.java?rev=1.1&content-type=text/plain
1.2 +0 -304
jahia/core/src/java/org/jahia/services/search/JahiaSearchIndexableDocumentImpl.java
(dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/JahiaSearchIndexableDocumentImpl.java?rev=1.1&content-type=text/plain
1.2 +1 -1
jahia/core/src/java/org/jahia/services/search/PageSearchResultBuilderImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/PageSearchResultBuilderImpl.java.diff?r1=1.1&r2=1.2&f=h
1.3 +5 -2
jahia/core/src/java/org/jahia/services/search/PageSearcher.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/PageSearcher.java.diff?r1=1.2&r2=1.3&f=h
1.2 +1 -1
jahia/core/src/java/org/jahia/services/search/ParsedObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/ParsedObject.java.diff?r1=1.1&r2=1.2&f=h
1.3 +1 -1
jahia/core/src/java/org/jahia/services/search/ParsedObjectImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/ParsedObjectImpl.java.diff?r1=1.2&r2=1.3&f=h
1.4 +0 -82
jahia/core/src/java/org/jahia/services/search/RemovedField.java (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/RemovedField.java?rev=1.3&content-type=text/plain
1.2 +3 -3
jahia/core/src/java/org/jahia/services/search/lucene/LuceneSearchIndexer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/lucene/LuceneSearchIndexer.java.diff?r1=1.1&r2=1.2&f=h
Index: ContainerSearcher.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/ContainerSearcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContainerSearcher.java 28 Feb 2005 16:10:19 -0000 1.3
+++ ContainerSearcher.java 3 Mar 2005 12:27:00 -0000 1.4
@@ -331,7 +331,7 @@
// Must set the query first.
setQuery (query);
- if (getQuery () == null)
+ if (getQuery () == null || "".equals(getQuery().trim()))
return result;
StringBuffer buff = new StringBuffer (1024);
@@ -343,7 +343,9 @@
this.loadRequest);
if ( queryStr.length()>0 ){
- queryStr = this.getQuery() + " AND " + queryStr;
+ queryStr = "(" + this.getQuery() + ")" + " AND " + queryStr;
+ } else {
+ queryStr = this.getQuery();
}
if (!isSiteModeSearching ()) {
Index: DocumentField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/DocumentField.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentField.java 28 Feb 2005 16:10:19 -0000 1.1
+++ DocumentField.java 3 Mar 2005 12:27:00 -0000 1.2
@@ -20,7 +20,7 @@
private String name;
private List values = new ArrayList();
- private int type = KEYWORD;
+ private int type = TEXT;
private float weight = 1.0f;
Index: PageSearchResultBuilderImpl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/PageSearchResultBuilderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageSearchResultBuilderImpl.java 28 Feb 2005 16:10:19 -0000 1.1
+++ PageSearchResultBuilderImpl.java 3 Mar 2005 12:27:00 -0000 1.2
@@ -141,7 +141,7 @@
found = false;
for (int j = 0; j < result.getHitCount(); j++) {
// page already found
JahiaSearchHit searchHit = (JahiaSearchHit)
result.results().elementAt(j);
- if (searchHit.hashCode() == aPage.getID()) {
+ if (searchHit.getPageId() == aPage.getID()) {
found = true;
if ( oneHitByPage ){
searchHit.setScore(searchHit.getScore() + 1);
Index: PageSearcher.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/PageSearcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageSearcher.java 28 Feb 2005 16:10:19 -0000 1.2
+++ PageSearcher.java 3 Mar 2005 12:27:00 -0000 1.3
@@ -101,7 +101,7 @@
JahiaSearchResult result = new JahiaSearchResult
(searchResultBuilder);
- if (getQuery () == null)
+ if (getQuery () == null || "".equals(getQuery().trim()))
return result;
try {
@@ -109,8 +109,11 @@
.getWorkflowAndLanguageCodeSearchQuery(this.getLanguageCodes(),
jParams.getEntryLoadRequest());
if ( queryStr.length()>0 ){
- queryStr = this.getQuery() + " AND " + queryStr;
+ queryStr = "(" + this.getQuery() + ")" + " AND " + queryStr;
+ } else {
+ queryStr = this.getQuery();
}
+
SearchResult searchResult = ServicesRegistry.getInstance()
.getJahiaSearchService().search(queryStr,this.getSearchHandlers(),jParams);
Vector parsedObjects =
SearchTools.getParsedObjects(searchResult);
Index: ParsedObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/ParsedObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParsedObject.java 30 Mar 2004 14:13:15 -0000 1.1
+++ ParsedObject.java 3 Mar 2005 12:27:00 -0000 1.2
@@ -30,7 +30,7 @@
/**
* Return an hastable of fieldname/values pair of information as they
were
- * stored through a AddedField by the search engine
+ * stored by the search engine
*
* the key is a String and the values is an array of string values
*
Index: ParsedObjectImpl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/ParsedObjectImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParsedObjectImpl.java 28 Feb 2005 16:10:19 -0000 1.2
+++ ParsedObjectImpl.java 3 Mar 2005 12:27:00 -0000 1.3
@@ -49,7 +49,7 @@
/**
* Return an hastable of fieldname/values pair of information as they
were
- * stored through the use of a JahiaSearchIndexableDocument by the
search engine
+ * stored through the search service
*
* the key is the field name and the values is an array of string values
*
Index: LuceneSearchIndexer.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/lucene/LuceneSearchIndexer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LuceneSearchIndexer.java 28 Feb 2005 16:20:03 -0000 1.1
+++ LuceneSearchIndexer.java 3 Mar 2005 12:27:00 -0000 1.2
@@ -221,7 +221,7 @@
for (int i=0; i<size; i++){
IndexableDocument nextObject =
(IndexableDocument)v.get(i);
if ( !(nextObject instanceof RemovableDocument) ){
- removeDoc(new
Term(nextObject.getKeyFieldName(),nextObject.getKey()));
+ removeDoc(new
Term(nextObject.getKeyFieldName(),NumberPadding.pad(nextObject.getKey())));
}
}
@@ -354,8 +354,8 @@
}
}
}
- doc.add (Field.Keyword (indObj.getKeyFieldName ().toLowerCase(),
- indObj.getKey ()));
+ doc.add (Field.Keyword(indObj.getKeyFieldName ().toLowerCase(),
+ NumberPadding.pad(indObj.getKey ())));
// Fixme : For performance issue, should be done in batch before
adding again.
// first remove previous entry
