From 3323f9cd5376eea8180ae3697675d03c39b116e6 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Mon, 29 Nov 2010 19:14:47 +0000 Subject: [PATCH] fixing getAllPropInstByVClass() to look at TBox model --- .../vitro/webapp/dao/jena/PropertyInstanceDaoJena.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java index c2831bef4..2b52a24c4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java @@ -147,15 +147,17 @@ public class PropertyInstanceDaoJena extends JenaBaseDao implements } allSuperclassURIs.addAll(vcDao.getAllSuperClassURIs(classURI)); + OntModel ontModel = getOntModelSelector().getTBoxModel(); + try { - getOntModel().enterCriticalSection(Lock.READ); + ontModel.enterCriticalSection(Lock.READ); Set applicableProperties = new HashSet(); try { for (String VClassURI : allSuperclassURIs) { - OntClass ontClass = getOntClass(getOntModel(),VClassURI); + OntClass ontClass = getOntClass(ontModel,VClassURI); if (ontClass != null) { if (ontClass.isRestriction()) { // TODO: check if restriction is something like @@ -176,7 +178,7 @@ public class PropertyInstanceDaoJena extends JenaBaseDao implements } HashSet allSuperclassURIset = new HashSet(allSuperclassURIs); - Iterator ops = getOntModel().listObjectProperties(); + Iterator ops = ontModel.listObjectProperties(); while (ops.hasNext()) { ObjectProperty op = (ObjectProperty) ops.next(); if (op.getNameSpace() != null && !NONUSER_NAMESPACES.contains(op.getNameSpace()) ) { @@ -220,7 +222,7 @@ public class PropertyInstanceDaoJena extends JenaBaseDao implements } } finally { - getOntModel().leaveCriticalSection(); + ontModel.leaveCriticalSection(); } Collections.sort(propInsts, new PropInstSorter());