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

changes related to NIHVIVO-205 ontology upgrade

Browse source
This commit is contained in:
bjl23 2010-04-01 15:39:29 +00:00
parent 6863bc25b5
commit e743a3fc0f
4 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -302,7 +302,7 @@ public class ABoxUpdater {
replacementProperty = newTboxModel.getOntProperty(parent.getURI()); replacementProperty = newTboxModel.getOntProperty(parent.getURI());
} }
OntModel deletePropModel = ModelFactory.createOntologyModel(); Model deletePropModel = ModelFactory.createDefaultModel();
if (replacementProperty == null) { if (replacementProperty == null) {
aboxModel.enterCriticalSection(Lock.WRITE); aboxModel.enterCriticalSection(Lock.WRITE);

7
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyUpdateSettings.java
View file

@ -11,6 +11,7 @@ public class OntologyUpdateSettings {
private String diffFile; private String diffFile;
private String logFile; private String logFile;
private String errorLogFile; private String errorLogFile;
private String addedDataFile;
private String removedDataFile; private String removedDataFile;
private OntModelSelector ontModelSelector; private OntModelSelector ontModelSelector;
@ -59,6 +60,12 @@ public class OntologyUpdateSettings {
public void setErrorLogFile(String errorLogFile) { public void setErrorLogFile(String errorLogFile) {
this.errorLogFile = errorLogFile; this.errorLogFile = errorLogFile;
} }
public String getAddedDataFile() {
return addedDataFile;
}
public void setAddedDataFile(String addedDataFile) {
this.addedDataFile = addedDataFile;
}
public String getRemovedDataFile() { public String getRemovedDataFile() {
return removedDataFile; return removedDataFile;
} }

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

@ -36,9 +36,15 @@ public class OntologyUpdater {
private final Log log = LogFactory.getLog(OntologyUpdater.class); private final Log log = LogFactory.getLog(OntologyUpdater.class);
private OntologyUpdateSettings settings; private OntologyUpdateSettings settings;
private OntologyChangeLogger logger;
private OntologyChangeRecord record;
public OntologyUpdater(OntologyUpdateSettings settings) { public OntologyUpdater(OntologyUpdateSettings settings) {
this.settings = 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 { public void update() throws IOException {
@ -75,8 +81,16 @@ public class OntologyUpdater {
private void updateABox(AtomicOntologyChangeLists changes) { private void updateABox(AtomicOntologyChangeLists changes)
// perform operations based on change objects 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 // run additional SPARQL CONSTRUCTS
} }

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

@ -8,6 +8,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
public class SimpleOntologyChangeRecord implements OntologyChangeRecord { public class SimpleOntologyChangeRecord implements OntologyChangeRecord {
@ -16,16 +17,13 @@ public class SimpleOntologyChangeRecord implements OntologyChangeRecord {
private final static String RDF_SYNTAX = "RDF/XML-ABBREV"; private final static String RDF_SYNTAX = "RDF/XML-ABBREV";
private Model additionsModel; private Model additionsModel = ModelFactory.createDefaultModel();
private Model retractionsModel; private Model retractionsModel = ModelFactory.createDefaultModel();
private File additionsFile; private File additionsFile;
private File retractionsFile; private File retractionsFile;
public SimpleOntologyChangeRecord( public SimpleOntologyChangeRecord(
Model additionsModel, Model retractionsModel,
String additionsFile, String retractionsFile) { String additionsFile, String retractionsFile) {
this.additionsModel = additionsModel;
this.retractionsModel = retractionsModel;
this.additionsFile = new File(additionsFile); this.additionsFile = new File(additionsFile);
if (!this.additionsFile.exists()) { if (!this.additionsFile.exists()) {
throw new RuntimeException(this.getClass().getName() + throw new RuntimeException(this.getClass().getName() +