Skip to content

Updated DAO for Virtuoso #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nvitucci wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated DAO for Virtuoso #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/java/es/upm/fi/dia/oeg/map4rdf/server/dao/impl/GeoSparqlDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ private String createGetGeoSparqlResourcesQuery(BoundingBox boundingBox, Set<Fac
StringBuilder query = new StringBuilder("PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> ");
query.append("PREFIX geosparql: <http://www.opengis.net/ont/geosparql#> ");
query.append("PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> ");
query.append("PREFIX bif:<bif:> ");

if(constraints!=null){
query.append("SELECT distinct ?r ?geosparqlwkt ?crs ?wkt ?facetID ?facetValueID ");
}else{
Expand Down Expand Up @@ -347,6 +349,8 @@ private String createGetALLGeoSparqlResourcesQuery(BoundingBox boundingBox, Set<
StringBuilder query = new StringBuilder("PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> ");
query.append("PREFIX geosparql: <http://www.opengis.net/ont/geosparql#> ");
query.append("PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> ");
query.append("PREFIX bif:<bif:> ");

if(constraints!=null){
query.append("SELECT distinct ?r ?label ?geosparqlwkt ?crs ?wkt ?seeAlso ?facetID ?facetValueID ");
}else{
Expand Down Expand Up @@ -393,6 +397,8 @@ private String createGetResourcesQuery(BoundingBox boundingBox, Set<FacetConstra
StringBuilder query = new StringBuilder("PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> ");
query.append("PREFIX geosparql: <http://www.opengis.net/ont/geosparql#> ");
query.append("PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> ");
query.append("PREFIX bif:<bif:> ");

if(constraints!=null){
query.append("SELECT distinct ?r ?label ?geosparqlwkt ?crs ?wkt ?seeAlso ?facetID ?facetValueID ");
}else{
Expand Down Expand Up @@ -451,7 +457,7 @@ private StringBuilder addGeoSparqlBoundingBoxFilter(StringBuilder originalQuery,
query.append("strdf:intersects(");
break;
case VIRTUOSO:
query.append("bif:st_intersects(");
query.append("bif:st_intersects( bif:st_geomfromtext( ");
break;
default:
query.append("strdf:intersects(");
Expand All @@ -469,7 +475,7 @@ private StringBuilder addGeoSparqlBoundingBoxFilter(StringBuilder originalQuery,
query.append("^^<http://strdf.di.uoa.gr/ontology#WKT>,?wkttocompare)).");
break;
case VIRTUOSO:
query.append("^^<http://strdf.di.uoa.gr/ontology#WKT>,?wkttocompare)).");
query.append("),?wkttocompare)).");
break;
default:
query.append("^^<http://strdf.di.uoa.gr/ontology#WKT>,?wkttocompare)).");
Expand Down