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

minor improvement for NIHVIVO-205 ontology upgrade

Browse source
This commit is contained in:
bjl23 2010-04-02 22:52:34 +00:00
parent f5627b74a6
commit 4a3ef8d03d
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,9 +59,12 @@ public class OntologyUpdater {
settings.getAddedDataFile(), settings.getRemovedDataFile()); settings.getAddedDataFile(), settings.getRemovedDataFile());
} }
public void update() throws IOException { public boolean update() throws IOException {
// Check to see if the update is necessary. // Check to see if the update is necessary.
if (updateRequired()) {
boolean updateRequired = updateRequired();
if (updateRequired) {
performUpdate(); performUpdate();
if (!logger.errorsWritten()) { if (!logger.errorsWritten()) {
@ -74,6 +77,9 @@ public class OntologyUpdater {
record.writeChanges(); record.writeChanges();
logger.closeLogs(); logger.closeLogs();
} }
return updateRequired;
} }
private void performUpdate() throws IOException { private void performUpdate() throws IOException {

4
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
View file

@ -100,8 +100,10 @@ public class UpdateKnowledgeBase implements ServletContextListener {
settings.setNewTBoxAnnotationsModel(newTBoxAnnotationsModel); settings.setNewTBoxAnnotationsModel(newTBoxAnnotationsModel);
try { try {
boolean updateRequired = (new OntologyUpdater(settings)).update();
if (updateRequired) {
doMiscAppMetadataReplacements(ctx.getRealPath(MISC_REPLACEMENTS_FILE), oms); doMiscAppMetadataReplacements(ctx.getRealPath(MISC_REPLACEMENTS_FILE), oms);
(new OntologyUpdater(settings)).update(); }
} catch (IOException ioe) { } catch (IOException ioe) {
String errMsg = "IOException updating knowledge base " + String errMsg = "IOException updating knowledge base " +
"for ontology changes: "; "for ontology changes: ";