wam 2002/07/04 08:22:28
Modified: src/webdav/server/org/apache/slide/webdav/method
SearchMethod.java
Log:
check resourcetype of scope
Revision Changes Path
1.27 +18 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java
Index: SearchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SearchMethod.java 25 Jun 2002 10:49:29 -0000 1.26
+++ SearchMethod.java 4 Jul 2002 15:22:27 -0000 1.27
@@ -74,6 +74,8 @@
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.webdav.util.WebdavUtils;
+
import org.apache.slide.search.SearchQuery;
import org.apache.slide.search.RequestedResource;
import org.apache.slide.search.SearchQueryResult;
@@ -84,6 +86,7 @@
import org.apache.slide.search.BadGatewayException;
import org.apache.slide.search.PropertyProvider;
import org.apache.slide.search.QueryScope;
+import org.apache.slide.search.basic.BasicQueryImpl;
//import org.apache.slide.lock.LockException;
//import org.apache.slide.lock.LockTokenNotFoundException;
@@ -172,6 +175,18 @@
req.getRequestURI());
requestedProperties = searchQuery.requestedProperties ();
+
+ if (searchQuery instanceof BasicQueryImpl) {
+ QueryScope scope = ((BasicQueryImpl)searchQuery).getScope();
+
+
+ String slidePath = ((BasicQueryImpl)searchQuery).getSlidePath();
+
+
+ scope.setIsCollection (
+ WebdavUtils.isCollection (token, slideToken, slidePath));
+
+ }
}
catch (JDOMException e) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
