From: <dc...@us...> - 2012-07-07 11:33:45
|
Revision: 3774 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3774&view=rev Author: dcherix Date: 2012-07-07 11:33:39 +0000 (Sat, 07 Jul 2012) Log Message: ----------- Adapted the simple sparql module to abstractknowledgesource Modified Paths: -------------- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java 2012-07-06 08:24:21 UTC (rev 3773) +++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java 2012-07-07 11:33:39 UTC (rev 3774) @@ -3,42 +3,50 @@ */ package org.dllearner.kb.sparql.simple; -import com.hp.hpl.jena.query.*; -import com.jamonapi.Monitor; -import com.jamonapi.MonitorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.hp.hpl.jena.ontology.OntModel; +import com.hp.hpl.jena.query.Query; +import com.hp.hpl.jena.query.QueryExecution; +import com.hp.hpl.jena.query.QueryExecutionFactory; +import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.query.QueryParseException; +import com.hp.hpl.jena.shared.JenaException; +import com.jamonapi.Monitor; +import com.jamonapi.MonitorFactory; /** * @author didierc */ public class QueryExecutor { - private static Logger log = LoggerFactory.getLogger(QueryExecutor.class); + private static Logger log = LoggerFactory.getLogger(QueryExecutor.class); + public OntModel executeQuery(String queryString, String endpoint, + OntModel model, String defaultGraphURI) { + Monitor monQueryingTotal = MonitorFactory.start("Query time total") + .start(); + try { + Query query = QueryFactory.create(queryString); + log.debug("Jena Query: ", query); + QueryExecution qExec; + if (defaultGraphURI == null) { + qExec = QueryExecutionFactory.sparqlService(endpoint, query); + } else { + qExec = QueryExecutionFactory.sparqlService(endpoint, query, + defaultGraphURI); + } - public OntModel executeQuery(String queryString, String endpoint, OntModel model, String defaultGraphURI) { - Monitor monQueryingTotal = MonitorFactory.start("Query time total").start(); - try{ - Query query = QueryFactory.create(queryString); - log.debug("Jena Query: ", query); - QueryExecution qExec; - if (defaultGraphURI == null) { - qExec = QueryExecutionFactory.sparqlService(endpoint, query); - - } else { - qExec = QueryExecutionFactory.sparqlService(endpoint, query, defaultGraphURI); - - } - log.debug("Qexec: {}", qExec); - qExec.execConstruct(model); - }catch (QueryParseException e ){ - log.warn("Query failed (skipping):\n" + queryString, e); - } - monQueryingTotal.stop(); - return model; - } + log.debug("Qexec: {}", qExec.getQuery()); + qExec.execConstruct(model); + } catch (QueryParseException e) { + log.warn("Query failed (skipping):\n" + queryString, e); + } catch (JenaException e) { + log.warn("Query failed (skipping):\n" + queryString, e); + } + monQueryingTotal.stop(); + return model; + } } Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-07-06 08:24:21 UTC (rev 3773) +++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-07-07 11:33:39 UTC (rev 3774) @@ -1,17 +1,24 @@ package org.dllearner.kb.sparql.simple; +import java.io.File; +import java.net.URI; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; -import com.hp.hpl.jena.ontology.OntModelSpec; +import org.dllearner.core.AbstractKnowledgeSource; import org.dllearner.core.ComponentAnn; import org.dllearner.core.ComponentInitException; -import org.dllearner.core.KnowledgeSource; +import org.dllearner.core.OntologyFormat; +import org.dllearner.core.OntologyFormatUnsupportedException; import org.dllearner.core.config.ConfigOption; + +import org.dllearner.core.owl.KB; + import org.dllearner.kb.OWLOntologyKnowledgeSource; + import org.dllearner.utilities.JamonMonitorLogger; import org.dllearner.utilities.analyse.TypeOntology; import org.semanticweb.owlapi.model.OWLOntology; @@ -21,19 +28,21 @@ import com.hp.hpl.jena.ontology.OntClass; import com.hp.hpl.jena.ontology.OntModel; +import com.hp.hpl.jena.ontology.OntModelSpec; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.NodeIterator; import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.ResIterator; import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.OWL; import com.jamonapi.Monitor; import com.jamonapi.MonitorFactory; @ComponentAnn(name = "efficient SPARQL fragment extractor", shortName = "sparqls", version = 0.1) -public class SparqlSimpleExtractor implements KnowledgeSource, OWLOntologyKnowledgeSource { +public class SparqlSimpleExtractor extends AbstractKnowledgeSource { + + @ConfigOption(name = "endpointURL", description = "URL of the SPARQL endpoint", required = true) private String endpointURL = null; private OntModel model = null; @@ -218,12 +227,12 @@ monIndexing.stop(); monComp.stop(); - log.info("*******Simple SPARQL Extractor********"); - /*for (Monitor monitor : MonitorFactory.getRootMonitor().getMonitors()) { - log.info("* {} *", monitor); - }*/ - log.info(JamonMonitorLogger.getStringForAllSortedByLabel()); - log.info("**************************************"); +// log.info("*******Simple SPARQL Extractor********"); +// /*for (Monitor monitor : MonitorFactory.getRootMonitor().getMonitors()) { +// log.info("* {} *", monitor); +// }*/ +// log.info(JamonMonitorLogger.getStringForAllSortedByLabel()); +// log.info("**************************************"); } public String getEndpointURL() { @@ -302,7 +311,27 @@ this.tboxfilter = tboxfilter; } - @Override + + @Override + public KB toKB() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String toDIG(URI kbURI) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void export(File file, OntologyFormat format) + throws OntologyFormatUnsupportedException { + // TODO Auto-generated method stub + + } + + public OWLOntology createOWLOntology(OWLOntologyManager manager) { JenaToOwlapiConverter converter = new JenaToOwlapiConverter(); return converter.convert(this.model,manager); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |