Author: chathura
Date: Mon Dec 10 01:56:20 2007
New Revision: 10811
Log:
Fixed the resource download link to work with older versions of the resource.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Mon Dec 10 01:56:20 2007
@@ -395,16 +395,17 @@
if (qPart != null) {
if (qPart.startsWith("v")) {
- path = path + "?" + qPart;
-
// check if URL is for the resource content (i.e.
/mycollection/myreosurce?v2&content
String[] q = qPart.split("&");
if (q.length == 2) {
if (q[1].equals("content")) {
+ path = path + "?" + q[0];
sendResourceContent(request, response, path);
return;
}
+ } else {
+ path = path + "?" + qPart;
}
} else if (qPart.equals("content")) {
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
Mon Dec 10 01:56:20 2007
@@ -32,6 +32,7 @@
private String path;
private String relativePath;
+ private String contentPath;
private String name;
private String author;
private String lastUpdater;
@@ -130,6 +131,13 @@
name = parts[parts.length - 1];
}
+ String[] qParts = path.split("\\?");
+ if (qParts.length > 1) {
+ contentPath = path + "&content";
+ } else {
+ contentPath = path + "?content";
+ }
+
Resource resource = registry.get(path);
if (resource.getAuthorUserName() != null) {
@@ -349,6 +357,14 @@
this.relativePath = relativePath;
}
+ public String getContentPath() {
+ return contentPath;
+ }
+
+ public void setContentPath(String contentPath) {
+ this.contentPath = contentPath;
+ }
+
public String getName() {
return name;
}
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Mon Dec 10 01:56:20 2007
@@ -220,7 +220,7 @@
<% } else { %>
<br/>
-<a href="/wso2registry/web<%=details.getPath()%>?content">Download</a>
+<a href="/wso2registry/web<%=details.getContentPath()%>">Download</a>
<br/>
<% } %>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
