juergen 02/04/16 02:24:41
Modified: src/webdav/server/org/apache/slide/webdav/method
ReportMethod.java
Log:
Fix for <locate-by-history> report:
Convert given history URI of request to slide internal URI.
(ralf)
Revision Changes Path
1.17 +16 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java
Index: ReportMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ReportMethod.java 12 Apr 2002 14:23:18 -0000 1.16
+++ ReportMethod.java 16 Apr 2002 09:24:41 -0000 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.16 2002/04/12 14:23:18 juergen Exp $
- * $Revision: 1.16 $
- * $Date: 2002/04/12 14:23:18 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.17 2002/04/16 09:24:41 juergen Exp $
+ * $Revision: 1.17 $
+ * $Date: 2002/04/16 09:24:41 $
*
* ====================================================================
*
@@ -164,7 +164,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -262,6 +262,11 @@
*/
protected VersioningHelper versioningHelper = null;
+ /**
+ * The URI of the server, e.g. <code>http://abc.org:4000</code>.
+ */
+ protected String serverUri = null;
+
/**
* Creates a ReportMethod with the given arguments.
@@ -288,6 +293,7 @@
retrieveResourcePath();
retrieveDepth();
+ serverUri = HTTP_PROTOCOL + req.getServerName()+ ":" + req.getServerPort();
if ( ! getRequest().getContentType().startsWith(TEXT_XML) ){
return;
@@ -524,6 +530,8 @@
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
+
+
try {
if (R_VERSION_TREE.equals(requestedReport)) {
executeVersionTreeReport(requestUri, multistatusElement,
getDepth());
@@ -1188,7 +1196,7 @@
isVersionHistory = false;
}
else {
- uriHandler = UriHandler.getUriHandler(token, href);
+ uriHandler = UriHandler.getUriHandler(token, getSlidePath(href));
isVersionHistory = uriHandler.isHistoryUri();
}
if ( ! isVersionHistory ) {
@@ -1252,6 +1260,9 @@
String currentHistoryUri = null;
while ( !found && iterator.hasNext() ) {
currentHistoryUri = ((Element)iterator.next()).getText();
+ if (currentHistoryUri != null) {
+ currentHistoryUri = getSlidePath(currentHistoryUri);
+ }
found = versionHistoryUri.equals(currentHistoryUri);
}
if (found) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
