--- a/src/main/java/org/sba_research/timbus/kb/importer/PronomImporter.java
+++ b/src/main/java/org/sba_research/timbus/kb/importer/PronomImporter.java
@@ -22,8 +22,10 @@
import com.hp.hpl.jena.query.*;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
+import org.sba_research.timbus.kb.Utils;
import org.sbaresearch.owl.OwlApiFacade;
import org.sbaresearch.owl.OwlElementNotFoundException;
+import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLNamedIndividual;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
import org.semanticweb.owlapi.vocab.OWL2Datatype;
@@ -43,7 +45,7 @@
public class PronomImporter implements DataImporter {
private static final Logger LOG = Logger.getLogger(PronomImporter.class.getName());
- private static final String TMP_FILENAME = "kb.out.owl";
+ private static final String TMP_FILENAME = "toolKB_instance.owl";
private OwlApiFacade owl;
private String kb;
@@ -94,7 +96,7 @@
Model jenaModel = getJenaModel();
while (results.hasNext()) {
QuerySolution result = results.next();
- String ext = result.getLiteral("ext").toString().trim();
+ String ext = Utils.cleanExtension(result.getLiteral("ext").toString());
if (ext.isEmpty()) {
LOG.severe("Extension not set.");
continue;
@@ -142,7 +144,11 @@
try {
for (; results.hasNext(); ) {
QuerySolution solution = results.nextSolution();
- individuals.add(owl.getIndividual(solution.get("format").toString()));
+ try {
+ individuals.add(owl.getIndividual(OwlApiFacade.getFragment(IRI.create(solution.get("format").toString()))));
+ } catch (OwlElementNotFoundException e) {
+ LOG.severe(solution.get("format").toString());
+ }
}
} finally {
qe.close();