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

[VIVO-1270] Updates to bulk handling

Browse source
This commit is contained in:
Graham Triggs 2016-09-09 18:53:16 +01:00
parent 478ad12f15
commit b8ef1046e2
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java
View file

@ -27,12 +27,22 @@ import java.util.List;
public class BulkUpdatingModel extends AbstractModelDecorator {
private static final RDFReaderF readerFactory = new RDFReaderFImpl();
private Graph graph;
private AbstractBulkUpdater updater;
protected BulkUpdatingModel(Model m) {
super(m);
graph = m.getGraph();
Graph graph = m.getGraph();
if (graph instanceof RDFServiceGraph) {
updater = new RDFServiceBulkUpdater((RDFServiceGraph)graph);
} else if (graph instanceof SparqlGraph) {
updater = new SparqlBulkUpdater((SparqlGraph)graph);
} else {
updater = null;
}
}
protected BulkUpdatingModel(Model m, Graph graph) {
super(m);
if (graph instanceof RDFServiceGraph) {
updater = new RDFServiceBulkUpdater((RDFServiceGraph)graph);
} else if (graph instanceof SparqlGraph) {

14
api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java
View file

@ -24,12 +24,22 @@ import java.util.List;
public class BulkUpdatingOntModel extends AbstractOntModelDecorator {
private static final RDFReaderF readerFactory = new RDFReaderFImpl();
private Graph graph;
private AbstractBulkUpdater updater;
protected BulkUpdatingOntModel(OntModel m) {
super(m);
graph = m.getGraph();
Graph graph = m.getGraph();
if (graph instanceof RDFServiceGraph) {
updater = new RDFServiceBulkUpdater((RDFServiceGraph)graph);
} else if (graph instanceof SparqlGraph) {
updater = new SparqlBulkUpdater((SparqlGraph)graph);
} else {
updater = null;
}
}
protected BulkUpdatingOntModel(OntModel m, Graph graph) {
super(m);
if (graph instanceof RDFServiceGraph) {
updater = new RDFServiceBulkUpdater((RDFServiceGraph)graph);
} else if (graph instanceof SparqlGraph) {

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactory.java
View file

@ -46,7 +46,7 @@ public class VitroModelFactory {
Model unionModel = ModelFactory.createModelForGraph(unionGraph);
return new BulkUpdatingModel(unionModel);
return new BulkUpdatingModel(unionModel, baseGraph);
}
public static OntModel createUnion(OntModel baseModel, OntModel plusModel) {
@ -58,7 +58,7 @@ public class VitroModelFactory {
Model unionModel = ModelFactory.createModelForGraph(unionGraph);
OntModel unionOntModel = ModelFactory.createOntologyModel(OWL_MEM, unionModel);
return new BulkUpdatingOntModel(unionOntModel);
return new BulkUpdatingOntModel(unionOntModel, baseGraph);
}
public static Model createModelForGraph(Graph g) {