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

various minor improvements

Browse source
This commit is contained in:
brianjlowe 2013-10-04 14:27:52 -04:00
parent aad1f023cc
commit 3a5fa4c551
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
View file

@ -226,7 +226,8 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
} }
} }
if (subjQueue.isEmpty()) { 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) { while(remaining.size() > 0) {
if(subjQueue.isEmpty()) { if(subjQueue.isEmpty()) {

3
webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java
View file

@ -295,7 +295,8 @@ public class ABoxRecomputer {
*/ */
protected Collection<String> getAllIndividualURIs() { protected Collection<String> 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); return getIndividualURIs(queryString);
} }

10
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java
View file

@ -82,8 +82,14 @@ public class ApplicationConfigurationOntologyUtils {
String domainURI = (domainRes != null) ? domainRes.getURI() : null; String domainURI = (domainRes != null) ? domainRes.getURI() : null;
String rangeURI = qsoln.getResource("range").getURI(); String rangeURI = qsoln.getResource("range").getURI();
if (appropriateDomain(domainRes, subject, tboxModel)) { if (appropriateDomain(domainRes, subject, tboxModel)) {
additionalProps.add(opDao.getObjectPropertyByURIs( ObjectProperty faux = opDao.getObjectPropertyByURIs(
opURI, domainURI, rangeURI)); opURI, domainURI, rangeURI);
if (faux != null) {
additionalProps.add(faux);
} else {
log.error("Could not retrieve " + opURI + " qualified by " +
" domain " + domainURI + " and range " + rangeURI);
}
} }
} }
} finally { } finally {