wam 02/03/08 04:10:21
Modified: src/webdav/server/org/apache/slide/webdav/method
SearchMethod.java
Log:
enable / disable SEARCH in slide.properties
bugfix in status codes
use non formatted XML output
Revision Changes Path
1.7 +15 -6
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SearchMethod.java 8 Mar 2002 10:14:04 -0000 1.6
+++ SearchMethod.java 8 Mar 2002 12:10:21 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
1.6 2002/03/08 10:14:04 wam Exp $
- * $Revision: 1.6 $
- * $Date: 2002/03/08 10:14:04 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
1.7 2002/03/08 12:10:21 wam Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/08 12:10:21 $
*
* ====================================================================
*
@@ -70,6 +70,7 @@
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
+import org.apache.slide.util.Configuration;
import org.apache.slide.search.SearchQuery;
import org.apache.slide.search.RequestedResource;
@@ -145,7 +146,7 @@
Element queryElement = getQueryElement();
String grammarNamespace = queryElement.getNamespaceURI();
-
+ if (Configuration.useSearch ()) {
try {
// SearchLanguage language = searchHelper.getLanguage
(grammarNamespace);
int maxDepth = getConfig().getDepthLimit();
@@ -163,6 +164,11 @@
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
}
+ }
+ else {
+ resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
+ throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ }
}
@@ -195,7 +201,7 @@
resp.setStatus(getErrorCode(e)); // no special handling needed
throw new WebdavException(WebdavStatus.SC_ACCEPTED, false); // abort
the TA
}
- resp.setStatus (WebdavStatus.SC_OK);
+ resp.setStatus (WebdavStatus.SC_MULTI_STATUS);
}
/**
@@ -257,6 +263,7 @@
(token, slideToken);
Iterator it = result.iterator();
+ String serverURL = "http://"; + req.getServerName()+ ":" +
req.getServerPort();
while (it.hasNext()) {
org.jdom.Element responseElement =
@@ -274,12 +281,14 @@
retriever.getPropertiesOfObject (requestedProperties,
uri,
req.getContextPath(),
+ serverURL,
true)
);
}
- XMLOutputter xmlWriter = new XMLOutputter (" ", true);
+ XMLOutputter xmlWriter = new XMLOutputter ();
xmlWriter.output (responseDoc, resp.getWriter());
}
}
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
