diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java index 7f7a22987..07fb45624 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java @@ -282,10 +282,12 @@ public class KnowledgeBaseUpdater { * needs to be updated to conform to a new ontology version */ public boolean updateRequired() throws IOException { + String sparqlQueryStr = loadSparqlQuery(settings.getAskQueryFile()); if (sparqlQueryStr == null) { return false; } + Model m = settings.getOntModelSelector().getApplicationMetadataModel(); Query query = QueryFactory.create(sparqlQueryStr); QueryExecution qexec = QueryExecutionFactory.create(query, m); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java index b52833db4..06ccb3610 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.ontology.update; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import com.hp.hpl.jena.ontology.OntModel; @@ -340,8 +341,12 @@ public void updateAnnotationModel() throws IOException { Statement stmt = iter.next(); if (!newTboxAnnotationsModel.contains(stmt) && !usesGroup(siteModel, stmt.getSubject())) { + long pre = retractions.size(); retractions.add(siteModel.listStatements(stmt.getSubject(),(Property) null,(RDFNode)null)); - logger.log("Removed the " + stmt.getSubject().getURI() + " ClassGroup from the annotations model."); + long post = retractions.size(); + if ((post - pre) > 0) { + logger.log("Removed the " + stmt.getSubject().getURI() + " ClassGroup from the annotations model."); + } } }