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

NIHVIVO-2252 fixed bug retrieving ontologies with URIs ending in hashes

Browse source
This commit is contained in:
brianjlowe 2011-07-07 20:46:28 +00:00
parent 0fdf28d3f5
commit a8dd57c6be
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java
View file

@ -38,10 +38,30 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
}
}
private com.hp.hpl.jena.ontology.Ontology getOntology(String ontologyURI, OntModel ontModel) {
private com.hp.hpl.jena.ontology.Ontology getOntology(String ontologyURI,
OntModel ontModel) {
// Something non-ideal happens here. There are places in the code that
// call getOntology() but don't pass the URI of the ontology resource
// itself. Instead, they pass the namespace that would appear
// in a PREFIX declaration. For example, we might have an ontology with
// the namespace http://example.org/ontology# .
// A class in this namespace might have the URI
// http://example.org/ontology#SomeClass . The ontology resource
// itself, however, may have the URI http://example.org/ontology
// (no final hash mark). To support assumptions in the code,
// this method calls adjustOntologyURI to remove a trailing hash
// mark if an ontology resource is not found at the specified URI.
try {
ontModel.enterCriticalSection(Lock.READ);
return ontModel.getOntology(adjustOntologyURI(ontologyURI));
com.hp.hpl.jena.ontology.Ontology o = ontModel.getOntology(
ontologyURI);
if (o != null) {
return o;
} else {
return ontModel.getOntology(
adjustOntologyURI(ontologyURI));
}
} finally {
ontModel.leaveCriticalSection();
}