Strabon
changeset 1333:da58093307e3
ChangeLog added comments
author | George Stamoulis <gstam@di.uoa.gr> |
---|---|
date | Tue May 06 20:45:05 2014 +0300 (2014-05-06) |
parents | 6d4657f75296 604953273abc |
children | e5abd174045f 72832610c547 |
files | ChangeLog |
line diff
1.1 --- a/ChangeLog Tue May 06 20:39:29 2014 +0300 1.2 +++ b/ChangeLog Tue May 06 20:45:05 2014 +0300 1.3 @@ -1,3 +1,7 @@ 1.4 + * Fixed a bug where strdf:intersection function did not work as an 1.5 + aggregate when used without 'GROUP BY'. 1.6 + (bug #46 https://bug.strabon.di.uoa.gr/ticket/46) 1.7 + 1.8 Sat Oct 19 23:37:23 2013 Pyravlos Team 1.9 1.10 * Revised the logos in Strabon Endpoint and the sample queries. 1.11 @@ -7,7 +11,6 @@ 1.12 Results in queries that are web urls now link to those urls and are not described. 1.13 The describe functionality can be accessed through the menu bar. 1.14 1.15 - 1.16 * Version 3.2.9 released. 1.17 1.18 * Added support for the following google chart types: PieChart,
2.1 --- a/README Tue May 06 20:39:29 2014 +0300 2.2 +++ b/README Tue May 06 20:45:05 2014 +0300 2.3 @@ -439,13 +439,13 @@ 2.4 The system Strabon has been developed by the following members of our team: 2.5 2.6 * Manos Karpathiotakis <mk@di.uoa.gr> 2.7 -* Kostis Kyzirakos <kkyzir@di.uoa.gr> 2.8 +* Kostis Kyzirakos <Kostis.Kyzirakos@cwi.nl> 2.9 * Manolis Koubarakis <koubarak@di.uoa.gr> 2.10 * Giorgos Garbis <ggarbis@di.uoa.gr> 2.11 * Konstantina Bereta <konstantina.bereta@di.uoa.gr> 2.12 * Charalampos Nikolaou <charnik@di.uoa.gr> 2.13 * Stella Gianakopoulou <sgian@di.uoa.gr> 2.14 -* Panagiotis Smeros <psmeros@di.uoa.gr> 2.15 +* Panayiotis Smeros <psmeros@di.uoa.gr> 2.16 * Kallirroi Dogani <kallirroi@di.uoa.gr> 2.17 2.18 2.19 @@ -472,6 +472,31 @@ 2.20 2.21 Known Issues 2.22 ============ 2.23 +* Strabon depends on a version of Sesame OpenRDF that is not hosted at the central 2.24 + repository of Maven. These artifacts resided on the Maven repository of Aduna 2.25 + which is not maintained any more. For this reason, you can use a mirror repository 2.26 + hosted by Ontotext. To configure maven to use the Ontotext mirror for the Aduna 2.27 + repository, you append to your settings file ${user.home}/.m2/settings.xml) the 2.28 + following: 2.29 + 2.30 +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 2.31 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 2.32 + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 2.33 + http://maven.apache.org/xsd/settings-1.0.0.xsd"> 2.34 +... 2.35 +... 2.36 + <mirrors> 2.37 + <mirror> 2.38 + <id>aduna-mirror</id> 2.39 + <name>Aduna Maven Repository - Mirror</name> 2.40 + <url>http://maven.ontotext.com/content/repositories/aduna/</url> 2.41 + <mirrorOf>aduna-opensource.releases</mirrorOf> 2.42 + </mirror> 2.43 + </mirrors> 2.44 +... 2.45 +... 2.46 +</settings> 2.47 + 2.48 * By default, Tomcat uses ISO-8859-1 character encoding when decoding URLs received 2.49 from a browser. This can cause problems when encoding is UTF-8, and you are using 2.50 international characters. In order to fix this, edit conf/server.xml and find the
3.1 --- a/endpoint-client/pom.xml Tue May 06 20:39:29 2014 +0300 3.2 +++ b/endpoint-client/pom.xml Tue May 06 20:45:05 2014 +0300 3.3 @@ -137,7 +137,7 @@ 3.4 <plugin> 3.5 <groupId>org.apache.maven.plugins</groupId> 3.6 <artifactId>maven-shade-plugin</artifactId> 3.7 - <version>2.0</version> 3.8 + <version>2.2</version> 3.9 <!-- 3.10 <configuration> 3.11 </configuration>
4.1 --- a/endpoint/WebContent/query.jsp Tue May 06 20:39:29 2014 +0300 4.2 +++ b/endpoint/WebContent/query.jsp Tue May 06 20:45:05 2014 +0300 4.3 @@ -172,10 +172,10 @@ 4.4 var map; 4.5 // create map 4.6 <%if(request.getAttribute("handle").toString().contains("timemap")){ %> 4.7 - map = tm.getNativeMap(); 4.8 - map.setOptions(myOptions); 4.9 + map = tm.getNativeMap(); 4.10 + map.setOptions(myOptions); 4.11 <%} else {%> 4.12 - var map = new google.maps.Map(document.getElementById("map"), myOptions); 4.13 + var map = new google.maps.Map(document.getElementById("map"), myOptions); 4.14 <%}%> 4.15 <% if (request.getAttribute("pathToKML") == null) {%> 4.16 // center at Brahames 4.17 @@ -185,7 +185,7 @@ 4.18 addListener(map); 4.19 4.20 4.21 - <%if ("map_local".equals(request.getAttribute("handle")) || ("timemap_local".equals(request.getAttribute("handle")))) {%> 4.22 + <%if ("map_local".equals(request.getAttribute("handle"))) {%> 4.23 // display using geoxml3 4.24 var myParser = new geoXML3.parser({map: map}); 4.25 myParser.parse(kml); 4.26 @@ -195,7 +195,7 @@ 4.27 <%}%> 4.28 4.29 <%if (("map".equals(request.getAttribute("handle"))) || ("map_local".equals(request.getAttribute("handle"))) 4.30 - || ("timemap".equals(request.getAttribute("handle"))) || ("timemap_local".equals(request.getAttribute("handle")))) {%> 4.31 + || ("timemap".equals(request.getAttribute("handle")))) {%> 4.32 $('html, body').animate({ 4.33 scrollTop: $("#divResultsStart").offset().top 4.34 }, 1500); 4.35 @@ -466,7 +466,6 @@ 4.36 <OPTION value="map"<%= ("map".equals(handle)) ? "selected":""%>>On a map</OPTION> 4.37 <OPTION value="map_local"<%= ("map_local".equals(handle)) ? "selected":""%>>On a map (localhost)</OPTION> 4.38 <OPTION value="timemap"<%= ("timemap".equals(handle)) ? "selected":""%>>On a timemap</OPTION> 4.39 - <OPTION value="timemap_local"<%= ("timemap_local".equals(handle)) ? "selected":""%>>On a timemap (localhost)</OPTION> 4.40 </SELECT> 4.41 </td> 4.42 </tr>
5.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java Tue May 06 20:39:29 2014 +0300 5.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java Tue May 06 20:45:05 2014 +0300 5.3 @@ -267,8 +267,7 @@ 5.4 5.5 out.flush(); 5.6 5.7 - } else if (("map".equals(handle) || "map_local".equals(handle) || 5.8 - "timemap".equals(handle) || "timemap_local".equals(handle) ) && 5.9 + } else if (("map".equals(handle) || "map_local".equals(handle) || "timemap".equals(handle)) && 5.10 (queryResultFormat == stSPARQLQueryResultFormat.KML || 5.11 queryResultFormat == stSPARQLQueryResultFormat.KMZ) ) { 5.12 // show map (only valid for KML/KMZ)