From 0703632f9af91413dd6bce414662984264ea02b0 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Fri, 2 Apr 2010 20:55:39 +0000 Subject: [PATCH] improvements for NIHVIVO-205 ontology upgrade --- .../webapp/ontology/update/ABoxUpdater.java | 6 +++--- .../ontology/update/OntologyChangeRecord.java | 2 ++ .../ontology/update/OntologyUpdater.java | 1 + .../update/SimpleOntologyChangeRecord.java | 18 +++++++++++------- 4 files changed, 17 insertions(+), 10 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 cc59f7a14..1f48148bb 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 @@ -374,7 +374,7 @@ public class ABoxUpdater { record.recordRetractions(deletePropModel); boolean plural = (deletePropModel.size() > 1); if (deletePropModel.size() > 0) { - logger.log(deletePropModel.size() + " statement" + (plural ? "s" : "") + " using " + + logger.log(deletePropModel.size() + " statement" + (plural ? "s" : "") + " with predicate " + propObj.getSourceURI() + " " + (plural ? "were" : "was") + " removed. "); } } else { @@ -421,8 +421,8 @@ public class ABoxUpdater { if (renamePropRetractModel.size() > 0) { logger.log(renamePropRetractModel.size() + " statment" + - ((renamePropRetractModel.size() > 1) ? "s" : "") + " using " + - "property " + propObj.getSourceURI() + " " + + ((renamePropRetractModel.size() > 1) ? "s" : "") + + " with predicate " + propObj.getSourceURI() + " " + ((renamePropRetractModel.size() > 1) ? "were" : "was") + " changed to use " + propObj.getDestinationURI() + " instead."); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeRecord.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeRecord.java index 8e8279a71..d25deb563 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeRecord.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeRecord.java @@ -10,4 +10,6 @@ public interface OntologyChangeRecord { public void recordRetractions(Model incrementalRetractions); + public void writeChanges(); + } 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 d40cce2eb..2930f8ced 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 @@ -71,6 +71,7 @@ public class OntologyUpdater { assertSuccess(); } + record.writeChanges(); logger.closeLogs(); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleOntologyChangeRecord.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleOntologyChangeRecord.java index 4e8418047..c24821ed6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleOntologyChangeRecord.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleOntologyChangeRecord.java @@ -19,7 +19,7 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord { private final static Log log = LogFactory.getLog(SimpleOntologyChangeRecord.class); - private final static String RDF_SYNTAX = "RDF/XML-ABBREV"; + private final static String RDF_SYNTAX = "N3"; private Model additionsModel = ModelFactory.createDefaultModel(); private Model retractionsModel = ModelFactory.createDefaultModel(); @@ -46,16 +46,11 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord { public void recordAdditions(Model incrementalAdditions) { additionsModel.add(incrementalAdditions); - if (additionsModel.size() > 0) { - write(additionsModel, additionsFile); - } + } public void recordRetractions(Model incrementalRetractions) { retractionsModel.add(incrementalRetractions); - if (retractionsModel.size() > 0) { - write(retractionsModel, retractionsFile); - } } private void write(Model model, File file) { @@ -67,5 +62,14 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord { " unable to write to RDF file", fnfe); } } + + public void writeChanges() { + if (additionsModel.size() > 0) { + write(additionsModel, additionsFile); + } + if (retractionsModel.size() > 0) { + write(retractionsModel, retractionsFile); + } + } }