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

NIHVIVO-3377 ensure owl:Ontology resource is included in export when exported ontology uses a hash namespace

Browse source
This commit is contained in:
brianjlowe 2011-12-01 14:46:50 +00:00
parent 31d0d8216b
commit d82f7a118f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
View file

@ -141,13 +141,14 @@ public class JenaModelUtils {
// if we're using to a hash namespace, the URI of the Ontology resource will be // if we're using to a hash namespace, the URI of the Ontology resource will be
// that namespace minus the final hash mark. // that namespace minus the final hash mark.
if ( namespace != null && namespace.endsWith("#") ) { if ( namespace != null && namespace.endsWith("#") ) {
queryStrList.add( makeDescribeQueryStr( OWL.Ontology.getURI(), namespace.substring(0,namespace.length()-2), graphURI ) ); queryStrList.add( makeDescribeQueryStr( OWL.Ontology.getURI(), namespace.substring(0,namespace.length()-1), graphURI ) );
} else { } else {
queryStrList.add( makeDescribeQueryStr( OWL.Ontology.getURI(), namespace, graphURI ) ); queryStrList.add( makeDescribeQueryStr( OWL.Ontology.getURI(), namespace, graphURI ) );
} }
// Perform the SPARQL DESCRIBEs // Perform the SPARQL DESCRIBEs
for ( String queryStr : queryStrList ) { for ( String queryStr : queryStrList ) {
log.info(queryStr + "\n\n");
Query tboxSparqlQuery = QueryFactory.create(queryStr); Query tboxSparqlQuery = QueryFactory.create(queryStr);
QueryExecution qe = QueryExecutionFactory.create(tboxSparqlQuery,dataset); QueryExecution qe = QueryExecutionFactory.create(tboxSparqlQuery,dataset);
try { try {
@ -303,9 +304,9 @@ public class JenaModelUtils {
} else { } else {
// limit resources to those in the supplied namespace // limit resources to those in the supplied namespace
buff buff
.append(" FILTER (afn:namespace(?res) = \"") .append(" FILTER (regex(str(?res), \"^")
.append(namespace) .append(namespace)
.append("\") \n"); .append("\")) \n");
} }
return buff.toString(); return buff.toString();
} }