You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/05/15 13:45:53 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method SearchMethod.java
juergen 02/05/15 04:45:53
Modified: src/webdav/server/org/apache/slide/webdav/method
SearchMethod.java
Log:
Use constant for DAV: namespace.
(ralf)
Revision Changes Path
1.16 +20 -16 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SearchMethod.java 26 Apr 2002 15:19:12 -0000 1.15
+++ SearchMethod.java 15 May 2002 11:45:53 -0000 1.16
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v 1.15 2002/04/26 15:19:12 wam Exp $
- * $Revision: 1.15 $
- * $Date: 2002/04/26 15:19:12 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v 1.16 2002/05/15 11:45:53 juergen Exp $
+ * $Revision: 1.16 $
+ * $Date: 2002/05/15 11:45:53 $
*
* ====================================================================
*
@@ -119,7 +119,13 @@
*
* @author <a href="mailto:wam@softwareag.com">Martin Wallmer</a>
*/
-public class SearchMethod extends WebdavMethod {
+public class SearchMethod extends WebdavMethod implements WebdavConstants {
+
+ /**
+ * Constant for the <code>DAV:</code> namespace (with prefix <code>D</code>)
+ */
+ protected static final org.jdom.Namespace DAV_NAMESPACE = org.jdom.Namespace.getNamespace(DEFAULT_PREFIX,
+ DEFAULT_NAMESPACE);
// ----------------------------------------------------- Instance variables
@@ -204,8 +210,7 @@
SearchQueryResult result = null;
try {
- resp.setContentType (ReportMethod.TEXT_XML + "; charset=" +
- ReportMethod.ENCODING);
+ resp.setContentType (TEXT_XML_UTF_8);
result = searchHelper.search (slideToken, searchQuery);
WebdavResult webdavResult = new WebdavResult (result, retriever);
@@ -369,9 +374,8 @@
String href = null;
int errorStatus = webdavStatus;
- org.jdom.Namespace namespace = org.jdom.Namespace.getNamespace ("D", "DAV:");
org.jdom.Element rootElement =
- new org.jdom.Element (WebdavConstants.E_MULTISTATUS, namespace);
+ new org.jdom.Element (E_MULTISTATUS, DAV_NAMESPACE);
responseDoc = new org.jdom.Document (rootElement);
@@ -380,11 +384,11 @@
while (it.hasNext()) {
org.jdom.Element responseElement =
- new org.jdom.Element (WebdavConstants.E_RESPONSE, namespace);
+ new org.jdom.Element (E_RESPONSE, DAV_NAMESPACE);
rootElement.addContent (responseElement);
org.jdom.Element hrefElement =
- new org.jdom.Element (WebdavConstants.E_HREF, namespace);
+ new org.jdom.Element (E_HREF, DAV_NAMESPACE);
RequestedResource resource = (RequestedResource)it.next();
String internalUri = resource.getInternalHref();
@@ -442,15 +446,15 @@
}
org.jdom.Element responseElement =
- new org.jdom.Element (WebdavConstants.E_RESPONSE, namespace);
+ new org.jdom.Element (E_RESPONSE, DAV_NAMESPACE);
org.jdom.Element hrefElement =
- new org.jdom.Element (WebdavConstants.E_HREF, namespace);
+ new org.jdom.Element (E_HREF, DAV_NAMESPACE);
hrefElement.addContent (href);
org.jdom.Element statusElement =
- new org.jdom.Element (WebdavConstants.E_STATUS, namespace);
+ new org.jdom.Element (E_STATUS, DAV_NAMESPACE);
statusElement.addContent (getStatusText (errorStatus));
responseElement.addContent (hrefElement);
@@ -459,8 +463,8 @@
String description = queryResult.getDescription();
if (description != null) {
org.jdom.Element responseDescriptionElement =
- new org.jdom.Element (WebdavConstants.E_RESPONSEDESCRIPTION,
- namespace);
+ new org.jdom.Element (E_RESPONSEDESCRIPTION,
+ DAV_NAMESPACE);
responseDescriptionElement.addContent (description);
responseElement.addContent (responseDescriptionElement);
@@ -469,7 +473,7 @@
if (status == SearchQueryResult.STATUS_INVALID_SCOPE) {
responseElement.addContent (
new org.jdom.Element ("scopeerror",
- namespace));
+ DAV_NAMESPACE));
}
rootElement.addContent (responseElement);
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>