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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
brianjlowe 2014-03-28 15:48:10 -04:00
commit df5af9a7b5
1 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
View file

@ -3,7 +3,6 @@
package edu.cornell.mannlib.vitro.webapp.ontology.update; package edu.cornell.mannlib.vitro.webapp.ontology.update;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -18,15 +17,17 @@ import java.util.List;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.openrdf.model.impl.URIImpl;
import com.hp.hpl.jena.iri.IRI;
import com.hp.hpl.jena.iri.IRIFactory;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Dataset;
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.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.rdf.model.StmtIterator;
@ -234,6 +235,7 @@ public class KnowledgeBaseUpdater {
Model dedupeModel = dataset.getDefaultModel(); Model dedupeModel = dataset.getDefaultModel();
Model additions = jiu.renameBNodes( Model additions = jiu.renameBNodes(
anonModel, settings.getDefaultNamespace() + "n", dedupeModel); anonModel, settings.getDefaultNamespace() + "n", dedupeModel);
additions = stripBadURIs(additions);
Model actualAdditions = ModelFactory.createDefaultModel(); Model actualAdditions = ModelFactory.createDefaultModel();
StmtIterator stmtIt = additions.listStatements(); StmtIterator stmtIt = additions.listStatements();
while (stmtIt.hasNext()) { while (stmtIt.hasNext()) {
@ -250,6 +252,36 @@ public class KnowledgeBaseUpdater {
} }
} }
private Model stripBadURIs(Model additions) {
Model badURITriples = ModelFactory.createDefaultModel();
StmtIterator stmtIt = additions.listStatements();
while (stmtIt.hasNext()) {
String[] uris = new String[3];
Statement stmt = stmtIt.nextStatement();
if(stmt.getSubject().isURIResource()) {
uris[0] = stmt.getSubject().getURI();
}
uris[1] = stmt.getPredicate().getURI();
if(stmt.getObject().isURIResource()) {
uris[2] = ((Resource) stmt.getObject()).getURI();
}
for (int i = 0; i < 3; i++) {
String uri = uris[i];
if (uri != null) {
IRIFactory factory = IRIFactory.jenaImplementation();
IRI iri = factory.create(uri);
if (iri.hasViolation(false)) {
badURITriples.add(stmt);
log.error("Discarding added triple " + stmt + " because " +
"it includes one or more invalid URIs.");
break;
}
}
}
}
additions.remove(badURITriples);
return additions;
}
private List<AtomicOntologyChange> getAtomicOntologyChanges() private List<AtomicOntologyChange> getAtomicOntologyChanges()
throws IOException { throws IOException {