Thread: [DL-Learner SVN] SF.net SVN: dl-learner: [301] trunk/src/dl-learner/org/dllearner/kb/sparql

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 301
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=301&view=rev
Author:   jenslehmann
Date:     2007-12-02 06:19:48 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
some cleanup

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java

Removed Paths:
-------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlHTTPRequest.java

Deleted: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlHTTPRequest.java
===================================================================

--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlHTTPRequest.java	2007-12-02 13:31:59 UTC (rev 300)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlHTTPRequest.java	2007-12-02 14:19:48 UTC (rev 301)
@@ -1,105 +0,0 @@
-package org.dllearner.kb.sparql;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.URLEncoder;
-import java.util.Iterator;
-import java.util.Set;
-
-
-
-public class SparqlHTTPRequest {
-	
-	
-	private SpecificSparqlEndpoint SparqlEndpoint;
-	
-	
-	
-	public SparqlHTTPRequest(SpecificSparqlEndpoint SparqlEndpoint){
-		this.SparqlEndpoint=SparqlEndpoint;		
-		
-		
-	}
-	
-	
-	public String  sendAndReceiveSPARQL( String sparql){
-		String ret= "";
-		try{
-		//System.out.println(sparql);
-		
-		//System.out.println(content);
-		
-		ret=this.sendAndReceive(sparql);
-		//System.out.println(ret);
-		
-		//this.sendAndReceiveSPARQL("SELECT * WHERE {?a ?b ?c} LIMIT 10");
-		}catch (Exception e) {e.printStackTrace();}
-		return ret;
-	
-		
-	}//down
-	
-	
-		
-	
-	
-	
-	private String sendAndReceive(String sparql) throws IOException{
-		StringBuilder answer = new StringBuilder();	
-		
-		// String an Sparql-Endpoint schicken
-		HttpURLConnection connection;
-			
-		connection = (HttpURLConnection) this.SparqlEndpoint.getURL().openConnection();
-		connection.setDoOutput(true);
-							
-		connection.addRequestProperty("Host", this.SparqlEndpoint.getHost());
-		connection.addRequestProperty("Connection","close");
-		connection.addRequestProperty("Accept","text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5");
-		connection.addRequestProperty("Accept-Language","de-de,de;q=0.8,en-us;q=0.5,en;q=0.3");
-		connection.addRequestProperty("Accept-Charset","utf-8;q=1.0");
-		connection.addRequestProperty("User-Agent","Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.8.1.4) Gecko/20070515 Firefox/2.0.0.4 Web-Sniffer/1.0.24");
-				
-		OutputStream os = connection.getOutputStream();
-		OutputStreamWriter osw = new OutputStreamWriter(os);
-		
-		Set<String> s =SparqlEndpoint.getParameters().keySet();
-		Iterator<String> it=s.iterator();
-		String FullURI="";
-		while (it.hasNext()) {
-			String element = (String) it.next();
-			FullURI+=""+URLEncoder.encode(element, "UTF-8")+"="+
-					URLEncoder.encode(SparqlEndpoint.getParameters().get(element), "UTF-8")+"&";
-		}
-		//System.out.println(FullURI);
-		FullURI+=""+SparqlEndpoint.getHasQueryParameter()+"="+URLEncoder.encode(sparql, "UTF-8");
-		
-		
-		osw.write(FullURI);
-		osw.close();
-				
-		// receive answer
-		InputStream is = connection.getInputStream();
-		InputStreamReader isr = new InputStreamReader(is,"UTF-8");
-		BufferedReader br = new BufferedReader(isr);
-			
-		String line;
-		do {
-			line = br.readLine();
-			if(line!=null)
-				answer.append(line);
-		} while (line != null);
-			
-		br.close();
-				
-		return answer.toString();
-	}
-	
-}
-

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java	2007-12-02 13:31:59 UTC (rev 300)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/TypedSparqlQuery.java	2007-12-02 14:19:48 UTC (rev 301)
@@ -1,18 +1,27 @@
 package org.dllearner.kb.sparql;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
 import java.net.URI;
+import java.net.URLEncoder;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 public class TypedSparqlQuery {
 	private Configuration Configuration;
-	private SparqlHTTPRequest SparqlHTTPRequest;
+	// private SparqlHTTPRequest SparqlHTTPRequest;
 	private SparqlQueryMaker SparqlQueryMaker;
 	Cache Cache;
 
 	public TypedSparqlQuery(Configuration Configuration) {
 		this.Configuration = Configuration;
-		this.SparqlHTTPRequest = new SparqlHTTPRequest(Configuration.getSparqlEndpoint());
+		// this.SparqlHTTPRequest = new SparqlHTTPRequest(Configuration.getSparqlEndpoint());
 		this.SparqlQueryMaker = new SparqlQueryMaker(Configuration.getSparqlQueryType());
 		this.Cache = new Cache("cache");
 	}
@@ -25,10 +34,15 @@
 		// check cache
 		String FromCache = this.Cache.get(u.toString(), sparql);
 		
-		String xml;
+		String xml = null;
 		// if not in cache get it from EndPoint
 		if (FromCache == null) {
-			xml = this.SparqlHTTPRequest.sendAndReceiveSPARQL(sparql);
+			try {
+				xml = sendAndReceiveSPARQL(sparql);
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 			//System.out.println(sparql);
 			//System.out.println(xml);
 			 this.Cache.put(u.toString(), xml, sparql);
@@ -77,4 +91,56 @@
 
 	}
 
+	private String sendAndReceiveSPARQL(String sparql) throws IOException{
+		StringBuilder answer = new StringBuilder();	
+		
+		// String an Sparql-Endpoint schicken
+		HttpURLConnection connection;
+		SpecificSparqlEndpoint se = Configuration.getSparqlEndpoint();	
+		
+		connection = (HttpURLConnection) se.getURL().openConnection();
+		connection.setDoOutput(true);
+							
+		connection.addRequestProperty("Host", se.getHost());
+		connection.addRequestProperty("Connection","close");
+		connection.addRequestProperty("Accept","text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5");
+		connection.addRequestProperty("Accept-Language","de-de,de;q=0.8,en-us;q=0.5,en;q=0.3");
+		connection.addRequestProperty("Accept-Charset","utf-8;q=1.0");
+		connection.addRequestProperty("User-Agent","Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.8.1.4) Gecko/20070515 Firefox/2.0.0.4 Web-Sniffer/1.0.24");
+				
+		OutputStream os = connection.getOutputStream();
+		OutputStreamWriter osw = new OutputStreamWriter(os);
+		
+		Set<String> s =se.getParameters().keySet();
+		Iterator<String> it=s.iterator();
+		String FullURI="";
+		while (it.hasNext()) {
+			String element = (String) it.next();
+			FullURI+=""+URLEncoder.encode(element, "UTF-8")+"="+
+					URLEncoder.encode(se.getParameters().get(element), "UTF-8")+"&";
+		}
+		//System.out.println(FullURI);
+		FullURI+=""+se.getHasQueryParameter()+"="+URLEncoder.encode(sparql, "UTF-8");
+		
+		
+		osw.write(FullURI);
+		osw.close();
+				
+		// receive answer
+		InputStream is = connection.getInputStream();
+		InputStreamReader isr = new InputStreamReader(is,"UTF-8");
+		BufferedReader br = new BufferedReader(isr);
+			
+		String line;
+		do {
+			line = br.readLine();
+			if(line!=null)
+				answer.append(line);
+		} while (line != null);
+			
+		br.close();
+				
+		return answer.toString();
+	}	
+	
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [DL-Learner SVN] SF.net SVN: dl-learner: [301] trunk/src/dl-learner/org/dllearner/kb/sparql

dl-learner-svn