From: <sk...@us...> - 2008-02-18 19:20:52
|
Revision: 608 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=608&view=rev Author: sknappe Date: 2008-02-18 11:20:47 -0800 (Mon, 18 Feb 2008) Log Message: ----------- charset is now utf-8 Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java =================================================================== --- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-02-18 19:20:32 UTC (rev 607) +++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-02-18 19:20:47 UTC (rev 608) @@ -21,6 +21,10 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.OutputStream; import java.nio.charset.Charset; import java.util.Iterator; import java.util.List; @@ -176,7 +180,11 @@ // possible Jena bug: Jena modifies the result set during // JSON transformation, so we need to get it back //resultSet = JSONtoResultSet(baos.toString()); - return baos.toString(); + try{ + return baos.toString("UTF-8"); + }catch (Exception e){ + return baos.toString(); + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ku...@us...> - 2008-06-27 13:45:54
|
Revision: 985 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=985&view=rev Author: kurzum Date: 2008-06-27 06:44:33 -0700 (Fri, 27 Jun 2008) Log Message: ----------- comments and formatting Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java =================================================================== --- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-06-26 15:21:53 UTC (rev 984) +++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-06-27 13:44:33 UTC (rev 985) @@ -44,16 +44,18 @@ public class SparqlQuery { private static Logger logger = Logger.getLogger(SparqlQuery.class); - private boolean isRunning = false; + private boolean wasExecuted = false; + private String queryString; + private QueryEngineHTTP queryExecution; + private SparqlEndpoint endpoint; - //private ResultSet rs; + private String json = null; -// private SparqlQueryException sendException=null; /** * Standard constructor. @@ -62,32 +64,29 @@ * @param endpoint */ public SparqlQuery(String queryString, SparqlEndpoint endpoint) { - // QUALITY there seems to be a bug in ontowiki - this.queryString = queryString.replaceAll("\n", " "); + // QUALITY there seems to be a bug in ontowiki + this.queryString = queryString.replaceAll("\n", " "); this.endpoint = endpoint; } - - - - /** - * Sends a SPARQL query using the Jena library. - * main format is JSON use method getasjson + * Sends a SPARQL query using the Jena library. main format is JSON, use + * method getasjson * * @return nothing */ - + public void send() { - wasExecuted = true; + wasExecuted = true; + // isRunning = true; ResultSet rs; - //isRunning = true; + writeToSparqlLog("***********\nNew Query:"); writeToSparqlLog(queryString); writeToSparqlLog(endpoint.getURL().toString()); - + String service = endpoint.getURL().toString(); - + // Jena access to SPARQL endpoint queryExecution = new QueryEngineHTTP(service, queryString); for (String dgu : endpoint.getDefaultGraphURIs()) { @@ -96,26 +95,25 @@ for (String ngu : endpoint.getNamedGraphURIs()) { queryExecution.addNamedGraph(ngu); } - - - //TODO remove after overnext Jena release - HttpQuery.urlLimit = 3*1024 ; - JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").start(); + + // TODO remove after overnext Jena release + HttpQuery.urlLimit = 3 * 1024; + JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime") + .start(); rs = queryExecution.execSelect(); JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").stop(); - - - logger.debug("query length: "+queryString.length()+" | ENDPOINT: "+endpoint.getURL().toString()); - //writeToSparqlLog("query: "+queryString+ " | ENDPOINT: "+endpoint.getURL().toString()); - - - + + logger.debug("query length: " + queryString.length() + " | ENDPOINT: " + + endpoint.getURL().toString()); + // writeToSparqlLog("query: "+queryString+ " | ENDPOINT: + // "+endpoint.getURL().toString()); + json = SparqlQuery.getAsJSON(rs); - - writeToSparqlLog("JSON: "+json); - + + writeToSparqlLog("JSON: " + json); + isRunning = false; - + } public void stop() { @@ -126,43 +124,97 @@ public String getQueryString() { return queryString; } - + public SparqlEndpoint getEndpoint() { - return endpoint; + return endpoint; } - + public boolean isRunning() { return isRunning; } - - public QueryEngineHTTP getExecution(){ + + public QueryEngineHTTP getExecution() { return queryExecution; } - -// public SparqlQueryException getException(){ -// return sendException; -// } + public void setJson(String json) { + this.wasExecuted = true; + this.json = json; + } + + public void setRunning(boolean running) { + this.isRunning = running; + } + /** + * returns the Result of the query as JSON string executes the query if it + * wasn't executed before + * + * @return + */ + public String getJson() { + if (wasExecuted == false) { + this.send(); + } + return json; + } + + /** + * makes a ResultSet from the Json String, depends on getJSON + * + * @return + */ + public ResultSet getResultSet() { + if (getJson() == null) { + return null; + } else + return JSONtoResultSet(json); + } + + /** + * makes an XML String from the Json String, depends on getJSON + * + * @return + */ + public String getXMLString() { + if (getJson() == null) { + return null; + } else + return JSONtoXML(json); + } + + public static void writeToSparqlLog(String s) { + try { + FileWriter fw = new FileWriter("log/sparql.txt", true); + fw.write(s + "\n"); + fw.flush(); + fw.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** * Converts Jena result set to XML. * * @return String xml */ public static String getAsXMLString(ResultSet resultSet) { - //if (rs == null) - // this.send(); + // if (rs == null) + // this.send(); return ResultSetFormatter.asXMLString(resultSet); } /** * Converts Jena result set to JSON. * - * @param resultSet The result set to transform. + * @param resultSet + * The result set to transform. * @return JSON representation of the result set. */ public static String getAsJSON(ResultSet resultSet) { // if (rs == null) - // this.send(); + // this.send(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); ResultSetFormatter.outputAsJSON(baos, resultSet); // possible Jena bug: Jena modifies the result set during @@ -186,10 +238,10 @@ public static ResultSet JSONtoResultSet(String json) { ByteArrayInputStream bais = new ByteArrayInputStream(json .getBytes(Charset.forName("UTF-8"))); - //System.out.println("JSON " + json); + // System.out.println("JSON " + json); return ResultSetFactory.fromJSON(bais); } - + /** * Converts from JSON to xml format. * @@ -200,39 +252,4 @@ public static String JSONtoXML(String json) { return getAsXMLString(JSONtoResultSet(json)); } - - public String getJson() { - if(wasExecuted == false){this.send();} - return json; - } - - public void setJson(String json) { - this.wasExecuted=true; - this.json = json; - } - - public void setRunning(boolean running){ - this.isRunning=running; - } - - public static void writeToSparqlLog(String s){ - try{ - FileWriter fw = new FileWriter("log/sparql.txt",true); - fw.write(s+"\n"); - fw.flush(); - fw.close(); - }catch (Exception e) { - e.printStackTrace(); - } - } - - public ResultSet getResultSet(){ - if(getJson() == null) {return null;} - else return JSONtoResultSet(json) ; - } - - public String getXMLString(){ - if(getJson() == null) {return null;} - else return JSONtoXML(json) ; - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |