Strabon

changeset 1191:98aae21ffe72

same
author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
date Mon Jul 08 01:05:31 2013 +0300 (2013-07-08)
parents a5340fe30e7f
children 9fbbd9a8d724
files endpoint/WebContent/WEB-INF/connection.properties endpoint/WebContent/query.jsp endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java
line diff
     1.1 --- a/endpoint/WebContent/WEB-INF/connection.properties	Mon Jul 08 00:18:21 2013 +0300
     1.2 +++ b/endpoint/WebContent/WEB-INF/connection.properties	Mon Jul 08 01:05:31 2013 +0300
     1.3 @@ -1,4 +1,4 @@
     1.4 -hostname=localhost
     1.5 +hostname=manolee.di.uoa.gr
     1.6  port=5432
     1.7  dbengine=postgis
     1.8  password=p1r3as
     2.1 --- a/endpoint/WebContent/query.jsp	Mon Jul 08 00:18:21 2013 +0300
     2.2 +++ b/endpoint/WebContent/query.jsp	Mon Jul 08 01:05:31 2013 +0300
     2.3 @@ -224,7 +224,8 @@
     2.4        
     2.5           <% if (request.getAttribute("response") != null) {
     2.6          	if (request.getParameter("format").equals("CHART")) {
     2.7 -        		 result= (TupleQueryResult) request.getAttribute("response");
     2.8 +        		 StrabonBeanWrapper sw = (StrabonBeanWrapper) request.getAttribute("response");
     2.9 +        		 result = sw.getResult();
    2.10          		 label1 = result.getBindingNames().get(0).toString();
    2.11          		 label2 = result.getBindingNames().get(1).toString();%>
    2.12   		
     3.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Mon Jul 08 00:18:21 2013 +0300
     3.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Mon Jul 08 01:05:31 2013 +0300
     3.3 @@ -334,7 +334,7 @@
     3.4  							request.setAttribute(RESPONSE, bos.toString());
     3.5  						} 
     3.6  						else if(format.equals(Format.CHART)){
     3.7 -							request.setAttribute(RESPONSE, strabonWrapper.getResult().toString());
     3.8 +							request.setAttribute(RESPONSE, strabonWrapper);
     3.9  						}
    3.10  						else {
    3.11  							request.setAttribute(RESPONSE, StringEscapeUtils.escapeHtml(bos.toString()));