Strabon
changeset 755:8d1d1e8229b7
merge
| author | Babis Nikolaou <charnik@di.uoa.gr> |
|---|---|
| date | Thu Nov 29 14:38:04 2012 +0200 (2012-11-29) |
| parents | d744ba95f73e 5c5de0ec6b45 |
| children | cdccd4393346 |
| files | endpoint/WebContent/WEB-INF/beans.xml |
line diff
1.1 --- a/AUTHORS Thu Nov 29 14:37:13 2012 +0200 1.2 +++ b/AUTHORS Thu Nov 29 14:38:04 2012 +0200 1.3 @@ -6,4 +6,4 @@ 1.4 Charalampos Nikolaou <charnik@di.uoa.gr> 1.5 Stella Gianakopoulou <sgian@di.uoa.gr> 1.6 Panagiotis Smeros <psmeros@di.uoa.gr> 1.7 -Kallirroi Dogani <roi@di.uoa.gr> 1.8 +Kallirroi Dogani <kallirroi@di.uoa.gr>
2.1 --- a/endpoint/WebContent/WEB-INF/beans.xml Thu Nov 29 14:37:13 2012 +0200 2.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml Thu Nov 29 14:38:04 2012 +0200 2.3 @@ -70,12 +70,13 @@ 2.4 2.5 <constructor-arg type="java.lang.String" > 2.6 <!-- Default prefixes --> 2.7 + <!-- PREFIX gag: <http://teleios.di.uoa.gr/ontologies/gagKallikratis.rdf#> --> 2.8 <value><![CDATA[PREFIX lgd:<http://linkedgeodata.org/triplify/> 2.9 PREFIX lgdgeo:<http://www.w3.org/2003/01/geo/wgs84_pos#> 2.10 PREFIX lgdont:<http://linkedgeodata.org/ontology/> 2.11 PREFIX geonames:<http://www.geonames.org/ontology#> 2.12 PREFIX clc: <http://geo.linkedopendata.gr/corine/ontology#> 2.13 -PREFIX gag: <http://teleios.di.uoa.gr/ontologies/gagKallikratis.rdf#> 2.14 +PREFIX gag: <http://geo.linkedopendata.gr/gag/ontology/> 2.15 PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 2.16 PREFIX dlr: <http://www.earthobservatory.eu/ontologies/dlrOntology-v2.owl#> 2.17 PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
3.1 --- a/endpoint/WebContent/browse.jsp Thu Nov 29 14:37:13 2012 +0200 3.2 +++ b/endpoint/WebContent/browse.jsp Thu Nov 29 14:38:04 2012 +0200 3.3 @@ -1,4 +1,4 @@ 3.4 -<%@page import="java.net.URLEncoder"%> 3.5 +<%@page import="java.net.URLDecoder"%> 3.6 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 3.7 <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> 3.8 <%@page import="org.springframework.web.context.WebApplicationContext"%> 3.9 @@ -69,8 +69,8 @@ 3.10 </TD> 3.11 </TR> 3.12 </TABLE> 3.13 - <h1>About: </h1> 3.14 - <a href=""><%=request.getAttribute("resource")%></a> 3.15 + <h1>About: </h1> 3.16 + <a href="#"><%=URLDecoder.decode(request.getAttribute("resource").toString(), "UTF-8")%></a> 3.17 <div id="response"> 3.18 <!-- Response --> 3.19 <% if (request.getAttribute("response") != null) {
4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java Thu Nov 29 14:37:13 2012 +0200 4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java Thu Nov 29 14:38:04 2012 +0200 4.3 @@ -20,6 +20,6 @@ 4.4 4.5 @Override 4.6 public String getURI() { 4.7 - return GeoConstants.inside; 4.8 + return GeoConstants.within; 4.9 } 4.10 }
5.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Thu Nov 29 14:37:13 2012 +0200 5.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Thu Nov 29 14:38:04 2012 +0200 5.3 @@ -31,6 +31,7 @@ 5.4 import org.openrdf.query.algebra.Var; 5.5 import org.openrdf.query.algebra.evaluation.function.Function; 5.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 5.7 +import org.openrdf.query.algebra.evaluation.function.link.AddDateTimeFunc; 5.8 import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 5.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 5.10 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 5.11 @@ -142,13 +143,22 @@ 5.12 5.13 if(right instanceof FunctionCall) 5.14 { 5.15 + System.out.println("FUNCTION:"+right.toString()); 5.16 Function function = FunctionRegistry.getInstance().get(((FunctionCall)right).getURI()); 5.17 if(function instanceof SpatialMetricFunc) 5.18 { 5.19 rightSql = spatialMetricFunction((FunctionCall) right, function); 5.20 } 5.21 + else if(((FunctionCall) right).getURI().toString().equalsIgnoreCase("http://example.org/custom-function/addDatetime")) 5.22 + { 5.23 + System.out.println("ADD DATE TIME FUNC!"); 5.24 + FunctionRegistry fr = FunctionRegistry.getInstance(); 5.25 + Function f = fr.get("http://example.org/custom-function/addDatetime"); 5.26 + if (f == null){System.out.println("COULD NOT GET DA FUNCTION!");} 5.27 + } 5.28 else //spatial property 5.29 { 5.30 + System.out.println("SPATIAL PROPERTY!!!"); 5.31 rightSql = spatialPropertyFunction((FunctionCall) right, function); 5.32 } 5.33 rightIsSpatial = true; 5.34 @@ -886,7 +896,7 @@ 5.35 { 5.36 return equalsGeo(leftArg,rightArg); 5.37 } 5.38 - else if(function.getURI().equals(GeoConstants.inside)) 5.39 + else if(function.getURI().equals(GeoConstants.within)) 5.40 { 5.41 return inside(leftArg,rightArg); 5.42 }
6.1 --- a/resultio-spatial/sparqlhtml/src/main/java/org/openrdf/query/resultio/sparqlhtml/stSPARQLResultsHTMLWriter.java Thu Nov 29 14:37:13 2012 +0200 6.2 +++ b/resultio-spatial/sparqlhtml/src/main/java/org/openrdf/query/resultio/sparqlhtml/stSPARQLResultsHTMLWriter.java Thu Nov 29 14:38:04 2012 +0200 6.3 @@ -139,7 +139,7 @@ 6.4 "(?object = <"+ boundValue.toString()+ ">)) " + 6.5 "}"; 6.6 6.7 - String href = "Browse?view=HTML&query="+URLEncoder.encode(query, "UTF-8")+"&format=HTML&resource="+boundValue.toString(); 6.8 + String href = "Browse?view=HTML&query="+URLEncoder.encode(query, "UTF-8")+"&format=HTML&resource="+URLEncoder.encode(boundValue.toString(), "UTF-8"); 6.9 xmlWriter.setAttribute(LINK_REF, href); 6.10 xmlWriter.startTag(LINK); 6.11 xmlWriter.text(boundValue.toString()); 6.12 @@ -152,7 +152,13 @@ 6.13 xmlWriter.text(boundValue.toString()); 6.14 } 6.15 xmlWriter.endTag(TABLE_DATA_TAG); 6.16 - } 6.17 + } 6.18 + else 6.19 + { 6.20 + xmlWriter.setAttribute(STYLE, TABLE_DATA_CLASS); 6.21 + xmlWriter.startTag(TABLE_DATA_TAG); 6.22 + xmlWriter.endTag(TABLE_DATA_TAG); 6.23 + } 6.24 value.setLength(0); 6.25 } 6.26 xmlWriter.endTag(TABLE_ROW_TAG);