Changeset 16205
- Timestamp:
- 14/07/08 13:54:07 (1 month ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/intermine/web/main/src/org/intermine/web/struts/TabLinkPreviewAction.java
r15666 r16205 12 12 13 13 import java.io.PrintWriter; 14 import java.io.UnsupportedEncodingException; 14 15 15 16 import javax.servlet.http.HttpServletRequest; … … 57 58 } 58 59 59 private String prepareURL(String link) {60 String url = link.replaceAll(" XXXXX", "&");60 private String prepareURL(String link) throws UnsupportedEncodingException { 61 String url = link.replaceAll("qwertyui", "&"); 61 62 url = URLUtil.encodeURL(url); 62 63 url = url + "&" + WebService.OUTPUT_PARAMETER + "=" trunk/intermine/webapp/main/resources/webapp/linkPreview.jsp
r15526 r16205 8 8 <?xml version="1.0" encoding="iso-8859-1"?> 9 9 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-1-transitional.dtd"> 10 <%@page import="java.net.URLDecoder"%> 10 11 <html> 11 12 … … 23 24 <body title="Example of page with results"> 24 25 25 <c:set var="link" value="${fn:replace(param.link, ' XXXXX', '&')}"></c:set>26 <c:set var="link" value="${fn:replace(param.link, 'qwertyui', '&')}"></c:set> 26 27 27 28 <h2 style="margin-bottom: 0px; font-family:Verdana,arial,Helvetica,sans-serif;">Your web page</h2> trunk/intermine/webapp/main/resources/webapp/serviceLink.jsp
r15526 r16205 4 4 <%-- Page displaying link to webservice. --%> 5 5 6 <%@page import="java.net.URLEncoder"%> 6 7 <style type="text/css"> 7 8 .highlighted { … … 45 46 46 47 <div style="margin-top: 10px;"> 47 <c:set var="encodedLink" value="${fn:replace(link, '&', 'XXXXX')}"></c:set> 48 <%-- Replacing & with unique string with almost 0 probability that it will be in url --%> 49 <c:set var="encodedLink" value="${fn:replace(link, '&', 'qwertyui')}"></c:set> 48 50 <table style="width:100%;"> 49 51 <tr>
