litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3674 read imports closure when loading ontologies from filegraph

Browse source
This commit is contained in:
stellamit 2012-03-06 20:46:00 +00:00
parent 1183f2d4b7
commit 33fddb8e69
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
View file

@ -20,7 +20,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.graph.Node; import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.ontology.OntDocumentManager;
import com.hp.hpl.jena.ontology.OntModel; 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.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.sdb.SDBFactory; import com.hp.hpl.jena.sdb.SDBFactory;
@ -48,6 +50,8 @@ public class FileGraphSetup implements ServletContextListener {
OntModelSelector baseOms = null; OntModelSelector baseOms = null;
try { try {
OntDocumentManager.getInstance().setProcessImports(true);
baseOms = ModelContext.getBaseOntModelSelector(sce.getServletContext()); baseOms = ModelContext.getBaseOntModelSelector(sce.getServletContext());
Store kbStore = (Store) sce.getServletContext().getAttribute("kbStore"); Store kbStore = (Store) sce.getServletContext().getAttribute("kbStore");
@ -78,6 +82,8 @@ public class FileGraphSetup implements ServletContextListener {
System.out.println("Throwable in listener " + this.getClass().getName()); System.out.println("Throwable in listener " + this.getClass().getName());
log.error(t); log.error(t);
t.printStackTrace(); t.printStackTrace();
} finally {
OntDocumentManager.getInstance().setProcessImports(false);
} }
if (isUpdateRequired(sce.getServletContext())) { if (isUpdateRequired(sce.getServletContext())) {
@ -114,7 +120,7 @@ public class FileGraphSetup implements ServletContextListener {
try { try {
FileInputStream fis = new FileInputStream( file ); FileInputStream fis = new FileInputStream( file );
try { try {
Model model = ModelFactory.createDefaultModel(); OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
if ( p.endsWith(".n3") || p.endsWith(".N3") || p.endsWith(".ttl") || p.endsWith(".TTL") ) { if ( p.endsWith(".n3") || p.endsWith(".N3") || p.endsWith(".ttl") || p.endsWith(".TTL") ) {
model.read( fis, null, "N3" ); model.read( fis, null, "N3" );
} else if ( p.endsWith(".owl") || p.endsWith(".OWL") || p.endsWith(".rdf") || p.endsWith(".RDF") || p.endsWith(".xml") || p.endsWith(".XML") ) { } else if ( p.endsWith(".owl") || p.endsWith(".OWL") || p.endsWith(".rdf") || p.endsWith(".RDF") || p.endsWith(".xml") || p.endsWith(".XML") ) {