From 4a3ef8d03d5a4274f1c2383c6f321d0c495c2bcc Mon Sep 17 00:00:00 2001 From: bjl23 Date: Fri, 2 Apr 2010 22:52:34 +0000 Subject: [PATCH] minor improvement for NIHVIVO-205 ontology upgrade --- .../vitro/webapp/ontology/update/OntologyUpdater.java | 10 ++++++++-- .../webapp/servlet/setup/UpdateKnowledgeBase.java | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdater.java index 2930f8ced..f98302293 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdater.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdater.java @@ -59,9 +59,12 @@ public class OntologyUpdater { settings.getAddedDataFile(), settings.getRemovedDataFile()); } - public void update() throws IOException { + public boolean update() throws IOException { + // Check to see if the update is necessary. - if (updateRequired()) { + + boolean updateRequired = updateRequired(); + if (updateRequired) { performUpdate(); if (!logger.errorsWritten()) { @@ -74,6 +77,9 @@ public class OntologyUpdater { record.writeChanges(); logger.closeLogs(); } + + return updateRequired; + } private void performUpdate() throws IOException { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java index 69377645b..3427d248d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java @@ -100,8 +100,10 @@ public class UpdateKnowledgeBase implements ServletContextListener { settings.setNewTBoxAnnotationsModel(newTBoxAnnotationsModel); try { - doMiscAppMetadataReplacements(ctx.getRealPath(MISC_REPLACEMENTS_FILE), oms); - (new OntologyUpdater(settings)).update(); + boolean updateRequired = (new OntologyUpdater(settings)).update(); + if (updateRequired) { + doMiscAppMetadataReplacements(ctx.getRealPath(MISC_REPLACEMENTS_FILE), oms); + } } catch (IOException ioe) { String errMsg = "IOException updating knowledge base " + "for ontology changes: ";