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

improvements for NIHVIVO-205 ontology upgrade

Browse source
This commit is contained in:
bjl23 2010-04-02 20:55:39 +00:00
parent 369454233f
commit 0703632f9a
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
View file

@ -374,7 +374,7 @@ public class ABoxUpdater {
record.recordRetractions(deletePropModel); record.recordRetractions(deletePropModel);
boolean plural = (deletePropModel.size() > 1); boolean plural = (deletePropModel.size() > 1);
if (deletePropModel.size() > 0) { 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. "); propObj.getSourceURI() + " " + (plural ? "were" : "was") + " removed. ");
} }
} else { } else {
@ -421,8 +421,8 @@ public class ABoxUpdater {
if (renamePropRetractModel.size() > 0) { if (renamePropRetractModel.size() > 0) {
logger.log(renamePropRetractModel.size() + " statment" + logger.log(renamePropRetractModel.size() + " statment" +
((renamePropRetractModel.size() > 1) ? "s" : "") + " using " + ((renamePropRetractModel.size() > 1) ? "s" : "") +
"property " + propObj.getSourceURI() + " " + " with predicate " + propObj.getSourceURI() + " " +
((renamePropRetractModel.size() > 1) ? "were" : "was") ((renamePropRetractModel.size() > 1) ? "were" : "was")
+ " changed to use " + + " changed to use " +
propObj.getDestinationURI() + " instead."); propObj.getDestinationURI() + " instead.");

2
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeRecord.java
View file

@ -10,4 +10,6 @@ public interface OntologyChangeRecord {
public void recordRetractions(Model incrementalRetractions); public void recordRetractions(Model incrementalRetractions);
public void writeChanges();
} }

1
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdater.java
View file

@ -71,6 +71,7 @@ public class OntologyUpdater {
assertSuccess(); assertSuccess();
} }
record.writeChanges();
logger.closeLogs(); logger.closeLogs();
} }
} }

18
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleOntologyChangeRecord.java
View file

@ -19,7 +19,7 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord {
private final static Log log = private final static Log log =
LogFactory.getLog(SimpleOntologyChangeRecord.class); 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 additionsModel = ModelFactory.createDefaultModel();
private Model retractionsModel = ModelFactory.createDefaultModel(); private Model retractionsModel = ModelFactory.createDefaultModel();
@ -46,16 +46,11 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord {
public void recordAdditions(Model incrementalAdditions) { public void recordAdditions(Model incrementalAdditions) {
additionsModel.add(incrementalAdditions); additionsModel.add(incrementalAdditions);
if (additionsModel.size() > 0) {
write(additionsModel, additionsFile);
}
} }
public void recordRetractions(Model incrementalRetractions) { public void recordRetractions(Model incrementalRetractions) {
retractionsModel.add(incrementalRetractions); retractionsModel.add(incrementalRetractions);
if (retractionsModel.size() > 0) {
write(retractionsModel, retractionsFile);
}
} }
private void write(Model model, File file) { private void write(Model model, File file) {
@ -67,5 +62,14 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord {
" unable to write to RDF file", fnfe); " unable to write to RDF file", fnfe);
} }
} }
public void writeChanges() {
if (additionsModel.size() > 0) {
write(additionsModel, additionsFile);
}
if (retractionsModel.size() > 0) {
write(retractionsModel, retractionsFile);
}
}
} }