Strabon

changeset 1177:b21554259954

SPARQL Endpoint Client: store operation supports now named graphs
author Kallirroi Dogani <kallirroi@di.uoa.gr>
date Sat May 18 21:11:58 2013 +0300 (2013-05-18)
parents 17429203392e
children 7557f1f6f2f5
files endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointStoreWithStrabon.java
line diff
     1.1 --- a/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java	Thu May 16 17:36:07 2013 +0300
     1.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java	Sat May 18 21:11:58 2013 +0300
     1.3 @@ -18,11 +18,15 @@
     1.4  import java.util.ArrayList;
     1.5  import java.util.List;
     1.6  
     1.7 +import org.apache.commons.httpclient.params.HostParams;
     1.8 +import org.apache.commons.httpclient.params.HttpMethodParams;
     1.9 +import org.apache.commons.httpclient.params.HttpParams;
    1.10  import org.apache.http.HttpEntity;
    1.11  import org.apache.http.HttpResponse;
    1.12  import org.apache.http.NameValuePair;
    1.13  import org.apache.http.client.entity.UrlEncodedFormEntity;
    1.14  import org.apache.http.client.methods.HttpPost;
    1.15 +import org.apache.http.entity.StringEntity;
    1.16  import org.apache.http.message.BasicNameValuePair;
    1.17  import org.apache.xerces.impl.dv.util.Base64;
    1.18  import org.openrdf.query.resultio.TupleQueryResultFormat;
    1.19 @@ -156,6 +160,8 @@
    1.20  		// set the url and fromurl parameters
    1.21  		List<NameValuePair> params = new ArrayList<NameValuePair>();
    1.22  		params.add(new BasicNameValuePair("data", data));
    1.23 +		if (namedGraph!=null)
    1.24 +			params.add(new BasicNameValuePair("graph", namedGraph.toString()));
    1.25  		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
    1.26  		method.setEntity(encodedEntity);
    1.27  		
    1.28 @@ -230,6 +236,8 @@
    1.29  		List<NameValuePair> params = new ArrayList<NameValuePair>();
    1.30  		params.add(new BasicNameValuePair("url", data.toString()));
    1.31  		params.add(new BasicNameValuePair("fromurl", ""));
    1.32 +		if (namedGraph!=null)
    1.33 +			params.add(new BasicNameValuePair("graph", namedGraph.toString()));
    1.34  		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
    1.35  		method.setEntity(encodedEntity);
    1.36  		
     2.1 --- a/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointStoreWithStrabon.java	Thu May 16 17:36:07 2013 +0300
     2.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointStoreWithStrabon.java	Sat May 18 21:11:58 2013 +0300
     2.3 @@ -36,7 +36,7 @@
     2.4  	@Before
     2.5  	public void init() {
     2.6  		// initialize endpoint
     2.7 -		endpoint = new SPARQLEndpoint("luna.di.uoa.gr", 8080, "endpoint/Store");
     2.8 +		endpoint = new SPARQLEndpoint("luna.di.uoa.gr", 8080, "sextant-endpoint/Store");
     2.9  		
    2.10  		// set url data
    2.11  		try {
    2.12 @@ -65,7 +65,8 @@
    2.13  	@Test
    2.14  	public void testStoreFromUrl() throws IOException {
    2.15  		
    2.16 -			Boolean response = endpoint.store(data, RDFFormat.NTRIPLES , null);
    2.17 +			URL namedGraph = new URL("http://geo.linkedopendata.gr/map/example");
    2.18 +			Boolean response = endpoint.store(data, RDFFormat.NTRIPLES , namedGraph);
    2.19  			
    2.20  			if (response != true) 
    2.21  				System.err.println("Error");
    2.22 @@ -83,8 +84,9 @@
    2.23  	@Test
    2.24  	public void testStore() throws IOException {
    2.25  		
    2.26 +			URL namedGraph = new URL("http://geo.linkedopendata.gr/map/example");
    2.27  			String data = "<http://geo.linkedopendata.gr/map/id/l22> <http://geo.linkedopendata.gr/map/hasName> \"layer22\" . ";
    2.28 -			Boolean response = endpoint.store(data, RDFFormat.NTRIPLES , null);
    2.29 +			Boolean response = endpoint.store(data, RDFFormat.NTRIPLES , namedGraph);
    2.30  			
    2.31  			if (response != true) 
    2.32  				System.err.println("Error");