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 1a2ff9a20..1ba6e6cff 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 @@ -302,7 +302,7 @@ public class ABoxUpdater { replacementProperty = newTboxModel.getOntProperty(parent.getURI()); } - OntModel deletePropModel = ModelFactory.createOntologyModel(); + Model deletePropModel = ModelFactory.createDefaultModel(); if (replacementProperty == null) { aboxModel.enterCriticalSection(Lock.WRITE); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdateSettings.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdateSettings.java index 3521d84c9..0236e6f20 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdateSettings.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdateSettings.java @@ -11,6 +11,7 @@ public class OntologyUpdateSettings { private String diffFile; private String logFile; private String errorLogFile; + private String addedDataFile; private String removedDataFile; private OntModelSelector ontModelSelector; @@ -59,6 +60,12 @@ public class OntologyUpdateSettings { public void setErrorLogFile(String errorLogFile) { this.errorLogFile = errorLogFile; } + public String getAddedDataFile() { + return addedDataFile; + } + public void setAddedDataFile(String addedDataFile) { + this.addedDataFile = addedDataFile; + } public String getRemovedDataFile() { return removedDataFile; } 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 fd89a89ec..cf1da3741 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 @@ -36,9 +36,15 @@ public class OntologyUpdater { private final Log log = LogFactory.getLog(OntologyUpdater.class); private OntologyUpdateSettings settings; + private OntologyChangeLogger logger; + private OntologyChangeRecord record; public OntologyUpdater(OntologyUpdateSettings settings) { this.settings = settings; + this.logger = new SimpleOntologyChangeLogger(settings.getLogFile(), + settings.getErrorLogFile()); + this.record = new SimpleOntologyChangeRecord( + settings.getAddedDataFile(), settings.getRemovedDataFile()); } public void update() throws IOException { @@ -75,8 +81,16 @@ public class OntologyUpdater { - private void updateABox(AtomicOntologyChangeLists changes) { - // perform operations based on change objects + private void updateABox(AtomicOntologyChangeLists changes) + throws IOException { + // TODO get models from somewhere + OntModel oldTBoxModel = null; + OntModel newTBoxModel = null; + OntModel ABoxModel = null; + ABoxUpdater aboxUpdater = new ABoxUpdater( + oldTBoxModel, newTBoxModel, ABoxModel, logger, record); + aboxUpdater.processPropertyChanges(changes.getAtomicPropertyChanges()); + aboxUpdater.processClassChanges(changes.getAtomicClassChanges()); // run additional SPARQL CONSTRUCTS } 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 030800d87..7c5b2ff1c 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 @@ -8,6 +8,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.rdf.model.Model; +import com.hp.hpl.jena.rdf.model.ModelFactory; public class SimpleOntologyChangeRecord implements OntologyChangeRecord { @@ -16,16 +17,13 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord { private final static String RDF_SYNTAX = "RDF/XML-ABBREV"; - private Model additionsModel; - private Model retractionsModel; + private Model additionsModel = ModelFactory.createDefaultModel(); + private Model retractionsModel = ModelFactory.createDefaultModel(); private File additionsFile; private File retractionsFile; public SimpleOntologyChangeRecord( - Model additionsModel, Model retractionsModel, String additionsFile, String retractionsFile) { - this.additionsModel = additionsModel; - this.retractionsModel = retractionsModel; this.additionsFile = new File(additionsFile); if (!this.additionsFile.exists()) { throw new RuntimeException(this.getClass().getName() +