Strabon

changeset 1221:bf3cb3f5ebe5

fixed HTML formatting for plain formats that were affected by changeset #1197.
author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
date Mon Jul 15 15:12:15 2013 +0300 (2013-07-15)
parents 29b9763c5db4
children 58c7dead7739
files endpoint/WebContent/query.jsp
line diff
     1.1 --- a/endpoint/WebContent/query.jsp	Mon Jul 15 14:27:49 2013 +0300
     1.2 +++ b/endpoint/WebContent/query.jsp	Mon Jul 15 15:12:15 2013 +0300
     1.3 @@ -373,15 +373,14 @@
     1.4  <a name="#results">&nbsp;</a>
     1.5  <div id="divResultsStart"></div>
     1.6  	<!-- Response -->
     1.7 -<% 
     1.8 -if (request.getAttribute("response") != null && !request.getAttribute("format").equals("CHART")) {
     1.9 -	if (!Common.getHTMLFormat().equals(request.getAttribute("format"))) {%>
    1.10 +<% if(request.getAttribute("format") == null || !request.getAttribute("format").equals("CHART")){ 
    1.11 +	if (request.getAttribute("response") != null) {
    1.12 +		if (Common.getHTMLFormat().equals(request.getParameter("format"))) {%>
    1.13  		<%=request.getAttribute("response")%>
    1.14 -	<%} else {
    1.15 -		%>
    1.16 +	<%} else { %>
    1.17  	<PRE><%=request.getAttribute("response") %></PRE>
    1.18  	<%}%>
    1.19 -<%}%>
    1.20 +<%}}%>
    1.21  	<!-- Response -->
    1.22  <% if (request.getAttribute("pathToKML") != null) { %>
    1.23  	<div id="map_canvas"></div>