knguyen 2005/09/13 16:43:02 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/search ContainerSearcher.java
Log:
jira JAHIA-381
Revision Changes Path
1.9.2.1.2.3 +7 -18
jahia/src/java/org/jahia/services/search/ContainerSearcher.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/ContainerSearcher.java.diff?r1=1.9.2.1.2.2&r2=1.9.2.1.2.3&f=h
Index: ContainerSearcher.java
===================================================================
RCS file:
/cvs/jahia/src/java/org/jahia/services/search/Attic/ContainerSearcher.java,v
retrieving revision 1.9.2.1.2.2
retrieving revision 1.9.2.1.2.3
diff -u -r1.9.2.1.2.2 -r1.9.2.1.2.3
--- ContainerSearcher.java 7 Jun 2005 15:47:22 -0000 1.9.2.1.2.2
+++ ContainerSearcher.java 13 Sep 2005 14:43:01 -0000 1.9.2.1.2.3
@@ -57,8 +57,6 @@
private ArrayList languageCodes = new ArrayList ();
- private String query;
-
//--------------------------------------------------------------------------
/**
* Constructor for one single container list search
@@ -66,7 +64,7 @@
* The vector contained in the JahiaSearchResult is a vector of matching
ctn ids, not the containers.
* No right check on container, only on field.
*
- * @param int ctnListID, the container list id.
+ * @param int ctnListID, the container list id.
* @param ctnListID
* @param query a valid Lucene search query
* @param loadRequest
@@ -76,7 +74,7 @@
if (loadRequest != null) {
this.loadRequest = loadRequest;
}
- this.query = query;
+ this.setQuery(query);
}
//--------------------------------------------------------------------------
@@ -98,7 +96,7 @@
if (loadRequest != null) {
this.loadRequest = loadRequest;
}
- this.query = query;
+ this.setQuery(query);
}
//--------------------------------------------------------------------------
@@ -122,7 +120,7 @@
this.ctnListID = clistID;
}
}
- this.query = query;
+ this.setQuery(query);
if (loadRequest != null) {
this.loadRequest = loadRequest;
}
@@ -176,7 +174,7 @@
if (loadRequest != null) {
this.loadRequest = loadRequest;
}
- this.query = query;
+ this.setQuery(query);
}
/**
@@ -353,21 +351,12 @@
this.siteIds = siteIds;
}
- /**
- * Return the query
- *
- * @return
- */
- public String getQuery () {
- return this.query;
- }
-
public boolean isQueryValid () {
- return (this.query != null && !"".equals (this.query.trim ()));
+ return (this.getQuery() != null && !"".equals (this.getQuery().trim
()));
}
public String toString() {
- return "Query=" + query;
+ return "Query=" + this.getQuery();
}
}
