diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java index b851fab9b..f2eae2554 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java @@ -226,7 +226,8 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic } } if (subjQueue.isEmpty()) { - throw new RuntimeException("No named subject in statement patterns"); + log.warn("No named subject in statement patterns"); + return stmts; } while(remaining.size() > 0) { if(subjQueue.isEmpty()) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java index 78244216b..0aa537aaa 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java @@ -295,7 +295,8 @@ public class ABoxRecomputer { */ protected Collection getAllIndividualURIs() { - String queryString = "select ?s where {?s a ?type}"; + String queryString = "SELECT DISTINCT ?s WHERE { GRAPH ?g { ?s a ?type } " + + " FILTER (!bound(?g) || !regex(str(?g),\"tbox\")) } ORDER BY ?s"; return getIndividualURIs(queryString); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java index ee25e2c07..24341a0f4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java @@ -82,8 +82,14 @@ public class ApplicationConfigurationOntologyUtils { String domainURI = (domainRes != null) ? domainRes.getURI() : null; String rangeURI = qsoln.getResource("range").getURI(); if (appropriateDomain(domainRes, subject, tboxModel)) { - additionalProps.add(opDao.getObjectPropertyByURIs( - opURI, domainURI, rangeURI)); + ObjectProperty faux = opDao.getObjectPropertyByURIs( + opURI, domainURI, rangeURI); + if (faux != null) { + additionalProps.add(faux); + } else { + log.error("Could not retrieve " + opURI + " qualified by " + + " domain " + domainURI + " and range " + rangeURI); + } } } } finally {