From 2a60a9c0e855e2f573c670b74c8269375cf0f8f3 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Fri, 2 Apr 2010 18:50:03 +0000 Subject: [PATCH] improvements and bugfix for NIHVIVO-205 ontology upgrade --- .../vitro/webapp/ontology/update/ABoxUpdater.java | 4 ++-- .../vitro/webapp/ontology/update/TBoxUpdater.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java index 0cb402b00..0d479113f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java @@ -291,8 +291,8 @@ public class ABoxUpdater { } //log summary of changes - logger.log("Class " + deletedClass.getURI() + " has been deleted. Any references to it in the knowledge base will be changed to " + - replacementClass.getURI()); + //logger.log("Class " + deletedClass.getURI() + " has been deleted. Any references to it in the knowledge base will be changed to " + + // replacementClass.getURI()); AtomicOntologyChange chg = new AtomicOntologyChange(deletedClass.getURI(), replacementClass.getURI(), AtomicChangeType.RENAME); renameClass(chg); 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 0b0f99d57..f762294a8 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 @@ -140,7 +140,7 @@ public class TBoxUpdater { continue; } - if (!siteObject.equals(oldObject)) { + if (siteObject.equals(oldObject)) { try { StmtIterator it = siteModel.listStatements(subject, predicate, (RDFNode)null); while (it.hasNext()) { @@ -178,12 +178,16 @@ public class TBoxUpdater { record.recordRetractions(actualRetractions); // log summary of changes - logger.log("Updated the default vitro annotation value for " + - actualAdditions.size() + " statments in the knowledge base."); + if (actualAdditions.size() > 0) { + logger.log("Updated the default vitro annotation value for " + + actualAdditions.size() + " statments in the knowledge base."); + } long numRemoved = actualRetractions.size() - actualAdditions.size(); - logger.log("Removed " + numRemoved + - " superfluous vitro annotation property settings from the knowledge base."); + if (numRemoved > 0) { + logger.log("Removed " + numRemoved + + " superfluous vitro annotation property settings from the knowledge base."); + } // Copy annotation property settings that were introduced in the new ontology // into the site model.