From a9eedce009fe2c38d1a9ea556673c274fc3a611d Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 29 May 2015 18:08:18 +0200 Subject: [PATCH] condition to reload data is now based on sys property --- default/queries/q0301.rq | 5 +++++ default/queries/q0400.rq | 7 ++++--- sparql-playground.war | Bin 20419430 -> 20419447 bytes .../tutorial/controller/SparqlController.java | 9 ++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/default/queries/q0301.rq b/default/queries/q0301.rq index 96e0e132..4d96a24a 100644 --- a/default/queries/q0301.rq +++ b/default/queries/q0301.rq @@ -15,3 +15,8 @@ select ?subSpecies where { # * -> means 0 or more # + -> means 1 or more # ? -> means 0 or 1 + +# The same can be used for any property for example: +# select ?parents where { +# ttr:Eve dbo:parent+ ?parents . +# } \ No newline at end of file diff --git a/default/queries/q0400.rq b/default/queries/q0400.rq index 9d97137a..1db7fe1f 100644 --- a/default/queries/q0400.rq +++ b/default/queries/q0400.rq @@ -1,11 +1,12 @@ #title:Search for lonely pets and try to find them a nice owner :) #comment: Insert the triplet using the data tab (you must run the web application locally) -#This query shows pet without owners +#This query shows pets with their owners if it exists #img:link-data #dbpedia:Harrison_Ford tto:pet ttr:SnuffMonkey. select ?pet ?owner where { ?pet a / rdfs:subClassOf+ tto:Animal . - filter not exists {?owner tto:pet ?pet} -} \ No newline at end of file + optional {?owner tto:pet ?pet} +} + diff --git a/sparql-playground.war b/sparql-playground.war index 95b76130d2bbd07e96ff6156d4d9e0c3a49b5c24..248504cc49ed27fb9207be8b79eeea72b0b83a47 100644 GIT binary patch delta 6819 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 CrA|@+ diff --git a/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java b/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java index d328befe..cf781ccf 100644 --- a/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java +++ b/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java @@ -1,6 +1,9 @@ package ch.isb.sib.sparql.tutorial.controller; import java.io.IOException; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -49,10 +52,10 @@ public void sparqlData(HttpServletResponse response) throws QueryEvaluationExcep @RequestMapping(value = "/ttl-data", method = RequestMethod.PUT) public long sparqlData(@RequestParam(value = "data", required = true) String data, HttpServletRequest request) throws QueryEvaluationException, Exception { - if("localhost".equals(request.getLocalName())){ - return sparqlService.loadData(data); + if((System.getProperty("reload") != null) && (System.getProperty("reload").equalsIgnoreCase("false"))){ //check if loading data is not allowed + throw new SparqlTutorialException("You must run the application in localhost in order to load data. Download it by clicking on the link below the page"); }else { - throw new SparqlTutorialException("You must run the application in localhost in order to load data. Download it on GitHub by following the link 'For Developers'"); + return sparqlService.loadData(data); } }