Author: knguyen
Date: Tue Sep 25 15:39:29 2007
New Revision: 18641
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18641&repname=
=3Djahia
Log:
rollback slide search commit
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/search/Web=
davSearchDelegate.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/sl=
ide/JahiaLucenePropertiesIndexer.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/sl=
ide/SlideSearchHandler.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/slide/domain.x=
ml
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/sear=
ch/WebdavSearchDelegate.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/search/WebdavSearchDelegate.java&re=
v=3D18641&repname=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-5-0-SP-BRANCH/core/src/java/org/jahia/engines/search/Web=
davSearchDelegate.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/search/Web=
davSearchDelegate.java Tue Sep 25 15:39:29 2007
@@ -20,7 +20,6 @@
import org.apache.webdav.lib.search.CompareOperator;
import org.apache.webdav.lib.search.SearchRequest;
import org.apache.webdav.lib.search.SearchScope;
-import org.apache.webdav.lib.search.SearchExpression;
import org.apache.webdav.lib.search.expressions.*;
import org.apache.slide.search.basic.Literals;
import org.apache.slide.webdav.util.WebdavConstants;
@@ -96,7 +95,6 @@
private boolean expandCustomOptions =3D false;
private int searchInContentAndFilename =3D CONTENT_AND_FILENAME ;
=
- private boolean hideCollection =3D false;
protected WebdavCriteriasHandler criteriasHandler;
=
static public String[] comparators =3D { Literals.CONTAINS,Literals.E=
Q,Literals.GT,Literals.GTE,
@@ -244,7 +242,6 @@
this.addModifiedToClause(searchRequest,jParams);
this.addCustomCriterias(searchRequest,jParams);
this.addFolderTypes(searchRequest,jParams);
- this.addCollectionCriteria(searchRequest,jParams);
this.addContainsClause(searchRequest,jParams);
this.setQuery(searchBuilder.build(searchRequest,new HashMap(),=
scopes));
} catch ( Throwable t ){
@@ -273,11 +270,10 @@
List criterias =3D this.criteriasHandler.getCriterias();
CriteriaBean criteria =3D null;
Iterator iterator =3D criterias.iterator();
- String[] values =3D null;
while ( iterator.hasNext() ){
criteria =3D (CriteriaBean)iterator.next();
if ( isCriteriaValid(criteria,false) ){
- SearchExpression exp =3D null;
+ CompareExpression exp =3D null;
String namespaceUri =3D criteria.getName().substring(0,cri=
teria.getName().indexOf(":")+1);
String localName =3D criteria.getName().substring(criteria=
.getName().indexOf(":")+1);
PropertyName propName =3D new PropertyName(namespaceUri,lo=
calName);
@@ -292,69 +288,50 @@
} catch ( Throwable t ){
continue;
}
- values =3D new String[]{value};
- } else {
- values =3D JahiaTools.getTokens(value,",");
}
- exp =3D getExpression(values,propName,criteria.getComparat=
or());
- if ( exp !=3D null ){
+ if ( Literals.CONTAINS.equals(criteria.getComparator())
+ || Literals.LIKE.equals(criteria.getComparator()) =
){
+ exp =3D new CompareExpression(CompareOperator.LIKE,pro=
pName,"%"+value+"%");
((AndExpression)searchRequest.getWhereExpression()).ad=
d(exp);
+ } else if (Literals.EQ.equals(criteria.getComparator())) {
+ exp =3D new CompareExpression(CompareOperator.EQ,propN=
ame,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(exp);
+ } else if (Literals.GT.equals(criteria.getComparator())){
+ exp =3D new CompareExpression(CompareOperator.GT,propN=
ame,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(exp);
+ } else if (Literals.GTE.equals(criteria.getComparator())){
+ exp =3D new CompareExpression(CompareOperator.GTE,prop=
Name,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(exp);
+ } else if (Literals.LT.equals(criteria.getComparator())){
+ exp =3D new CompareExpression(CompareOperator.LT,propN=
ame,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(exp);
+ } else if (Literals.LTE.equals(criteria.getComparator())){
+ exp =3D new CompareExpression(CompareOperator.LTE,prop=
Name,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(exp);
+ } else if (Literals.NOT_CONTAINS.equals(criteria.getCompar=
ator())){
+ exp =3D new CompareExpression(CompareOperator.LIKE,pro=
pName,"%"+value+"%");
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(searchRequest.not(exp));
+ } else if (Literals.NOT_EQ.equals(criteria.getComparator()=
)){
+ exp =3D new CompareExpression(CompareOperator.EQ,propN=
ame,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(searchRequest.not(exp));
+ } else if (Literals.NOT_GT.equals(criteria.getComparator()=
)){
+ exp =3D new CompareExpression(CompareOperator.GT,propN=
ame,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(searchRequest.not(exp));
+ } else if (Literals.NOT_GTE.equals(criteria.getComparator(=
))){
+ exp =3D new CompareExpression(CompareOperator.GTE,prop=
Name,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(searchRequest.not(exp));
+ } else if (Literals.NOT_LT.equals(criteria.getComparator()=
)){
+ exp =3D new CompareExpression(CompareOperator.LT,propN=
ame,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(searchRequest.not(exp));
+ } else if (Literals.NOT_LTE.equals(criteria.getComparator(=
))){
+ exp =3D new CompareExpression(CompareOperator.LTE,prop=
Name,value);
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(searchRequest.not(exp));
}
}
}
}
=
- private SearchExpression getExpression(String[] values,
- PropertyName propName,
- String compOperator){
- List exps =3D new ArrayList();
- String value =3D null;
- CompareExpression exp =3D null;
- for (int i=3D0;i<values.length;i++){
- value =3D values[i];
- if ( Literals.CONTAINS.equals(compOperator)
- || Literals.LIKE.equals(compOperator) ){
- exps.add(new CompareExpression(CompareOperator.LIKE,propNa=
me,"%"+value+"%"));
- } else if (Literals.EQ.equals(compOperator)) {
- exps.add(new CompareExpression(CompareOperator.EQ,propName=
,value));
- } else if (Literals.GT.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.GT,propName=
,value));
- } else if (Literals.GTE.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.GTE,propNam=
e,value));
- } else if (Literals.LT.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.LT,propName=
,value));
- } else if (Literals.LTE.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.LTE,propNam=
e,value));
- } else if (Literals.NOT_CONTAINS.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.LIKE,propNa=
me,"%"+value+"%"));
- } else if (Literals.NOT_EQ.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.EQ,propName=
,value));
- } else if (Literals.NOT_GT.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.GT,propName=
,value));
- } else if (Literals.NOT_GTE.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.GTE,propNam=
e,value));
- } else if (Literals.NOT_LT.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.LT,propName=
,value));
- } else if (Literals.NOT_LTE.equals(compOperator)){
- exps.add(new CompareExpression(CompareOperator.LTE,propNam=
e,value));
- }
- }
- if ( exps.size() =3D=3D 0 ){
- return null;
- } else if ( exps.size() =3D=3D 1 ){
- return (CompareExpression)exps.get(0);
- } else {
- OrExpression orExpression =3D new OrExpression();
- Iterator it =3D exps.iterator();
- while ( it.hasNext() ){
- exp =3D (CompareExpression)it.next();
- orExpression.add(exp);
- }
- return orExpression;
- }
- }
-
- /**
+ /**
* Append folder types criterias
*
* @param searchRequest
@@ -396,21 +373,6 @@
}
=
/**
- * Append Collection criteria
- *
- * @param searchRequest
- * @param jParams
- */
- public void addCollectionCriteria(SearchRequest searchRequest, Process=
ingContext jParams){
- if ( this.hideCollection ){
- // hide collection resource
- PropertyName propName =3D new PropertyName(Constants.DAV, Node=
RevisionDescriptor.RESOURCE_TYPE);
- CompareExpression exp =3D new CompareExpression(CompareOperato=
r.EQ,propName,NodeRevisionDescriptor.COLLECTION_TYPE);
- ((AndExpression)searchRequest.getWhereExpression()).add(search=
Request.not(exp));
- }
- }
-
- /**
* <D:from>...</D:from> clause
*
* @param jParams
@@ -950,14 +912,6 @@
}
}
=
- public boolean isHideCollection() {
- return hideCollection;
- }
-
- public void setHideCollection(boolean hideCollection) {
- this.hideCollection =3D hideCollection;
- }
-
protected void useSaveSearchDoc(ProcessingContext jParams, Element roo=
t)
throws JahiaException {
try
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/sea=
rch/slide/JahiaLucenePropertiesIndexer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/search/slide/JahiaLuceneProperties=
Indexer.java&rev=3D18641&repname=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-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/sl=
ide/JahiaLucenePropertiesIndexer.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/sl=
ide/JahiaLucenePropertiesIndexer.java Tue Sep 25 15:39:29 2007
@@ -32,9 +32,6 @@
public void initialize(NamespaceAccessToken token)
throws ServiceInitializationFailedException {
super.initialize(token);
- if ( this.index !=3D null ){
- Index.propertiesIndexerConfiguration =3D this.index.getConfigu=
ration();
- }
}
=
public void setParameters(Hashtable parameters)
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/sea=
rch/slide/SlideSearchHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/search/slide/SlideSearchHandler.ja=
va&rev=3D18641&repname=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-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/sl=
ide/SlideSearchHandler.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/sl=
ide/SlideSearchHandler.java Tue Sep 25 15:39:29 2007
@@ -135,8 +135,6 @@
String id =3D jParams.getSession(true).getId();
webdavResource.getSessionInstance(httpURL).getState().addCooki=
e(new Cookie(httpURL.getHost(), "JSESSIONID", id, "/", -1, false));
webdavResource.getSessionInstance(httpURL).getState().addCooki=
e(new Cookie(httpURL.getHost(), "JSESSIONID", id, jParams.getContextPath(),=
-1, false));
- jParams.getSession().setAttribute("org.apache.slide.webdav.met=
hod.credentials", jParams.getUser().getUsername());
-
HttpClient client =3D webdavResource.getSessionInstance(httpUR=
L);
int state =3D client.executeMethod(method);
logger.debug("Webdav search state :" + state);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/slide/do=
main.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/slide/domain.xml&rev=3D18641&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/slide/domain.x=
ml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/slide/domain.x=
ml Tue Sep 25 15:39:29 2007
@@ -76,7 +76,6 @@
<events>
<event classname=3D"org.apache.slide.event.EventCollection" enable=
=3D"true"></event>
<event classname=3D"org.apache.slide.event.TransactionEvent" enabl=
e=3D"true"></event>
- <event classname=3D"org.apache.slide.event.DomainEvent" enable=3D"=
false"></event>
<!--event classname=3D"org.apache.slide.event.EventCollection" met=
hod=3D"collected" enable=3D"true"></event-->
<!--event classname=3D"org.apache.slide.event.EventCollection" met=
hod=3D"vetoable-collected" enable=3D"true"></event-->
=
@@ -95,8 +94,6 @@
=
<listener classname=3D"org.apache.slide.event.VetoableEventCollect=
or"/>
<listener classname=3D"org.apache.slide.event.TransientEventCollec=
tor"/>
- <!--listener classname=3D"org.jahia.services.webdav.listeners.Copy=
PropertyToSubObjectsListener"/-->
- <!--listener classname=3D"org.jahia.services.webdav.listeners.Jahi=
aGEDListener"/-->
<!--listener classname=3D"org.apache.slide.extractor.PropertyExtra=
ctorTrigger" /-->
<listener classname=3D"org.jahia.services.search.slide.PropertyExt=
ractorTrigger" />
<listener classname=3D"org.apache.slide.macro.MacroPropertyUpdater=
"/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
