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

changing the method for removing obsolete annotations

Browse source
This commit is contained in:
sjm222 2011-01-17 14:52:35 +00:00
parent c97822efcd
commit 4855cab148
2 changed files with 53 additions and 9 deletions
Show stats 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

@ -644,4 +644,10 @@ public class ABoxUpdater {
: ((Resource)statement.getObject()).getURI() + " (Resource)") + "]"; : ((Resource)statement.getObject()).getURI() + " (Resource)") + "]";
} }
public static String stmtString(Resource subject, Property predicate, RDFNode object) {
return " [subject = " + subject.getURI() +
"] [property = " + predicate.getURI() +
"] [object = " + (object.isLiteral() ? ((Literal)object).getLexicalForm() + " (Literal)"
: ((Resource)object).getURI() + " (Resource)") + "]";
}
} }

52
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java
View file

@ -327,6 +327,8 @@ public void updateAnnotationModel() throws IOException {
// the default assignment in the new version but haven't migration yet. How // the default assignment in the new version but haven't migration yet. How
// to handle this? // to handle this?
removeObsoleteAnnotations();
siteModel.enterCriticalSection(Lock.WRITE); siteModel.enterCriticalSection(Lock.WRITE);
try { try {
@ -361,20 +363,56 @@ public void updateAnnotationModel() throws IOException {
public boolean usesGroup(Model model, Resource theClassGroup) throws IOException { public boolean usesGroup(Model model, Resource theClassGroup) throws IOException {
//logger.log("called for " + theClassGroup.getLocalName() );
model.enterCriticalSection(Lock.READ); model.enterCriticalSection(Lock.READ);
try { try {
StmtIterator iter = model.listStatements((Resource) null, inClassGroupProp, theClassGroup);
while (iter.hasNext()) {
logger.log("statement: " + ABoxUpdater.stmtString(iter.next()));
}
return (model.contains((Resource) null, inClassGroupProp, theClassGroup) ? true : false); return (model.contains((Resource) null, inClassGroupProp, theClassGroup) ? true : false);
} finally { } finally {
model.leaveCriticalSection(); model.leaveCriticalSection();
} }
} }
public void removeObsoleteAnnotations() throws IOException {
Resource subj1 = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createResource("http://vivoweb.org/ontology/florida#StatewideGoalAndFocusArea");
Resource obj1 = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createResource("http://vivoweb.org/ontology#vitroClassGrouptopics");
Property subj2 = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createProperty("http://vivoweb.org/ontology/florida#divisionOfSponsoredResearchNumber");
Resource obj2 = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createResource("http://vivoweb.org/ontology#vitroPropertyGroupidentifiers");
Property subj3 = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createProperty("http://vivoweb.org/ontology/florida#statewideGoalAndFocusArea");
Resource obj3 = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createResource("http://vivoweb.org/ontology#vitroPropertyGroupoutreach");
Property inPropertyGroupProp = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createProperty("http://vitro.mannlib.cornell.edu/ns/vitro/0.7#inPropertyGroup");
siteModel.enterCriticalSection(Lock.WRITE);
try {
Model retractions = ModelFactory.createDefaultModel();
if (siteModel.contains(subj1, inClassGroupProp, obj1) ) {
retractions.add(subj1, inClassGroupProp, obj1);
logger.log("Removed statement " + ABoxUpdater.stmtString(subj1, inClassGroupProp, obj1) + " from the knowledge base.");
}
if (siteModel.contains(subj2, inPropertyGroupProp, obj2) ) {
retractions.add(subj2, inPropertyGroupProp, obj2);
logger.log("Removed statement " + ABoxUpdater.stmtString(subj2, inPropertyGroupProp, obj2) + " from the knowledge base.");
}
if (siteModel.contains(subj3, inPropertyGroupProp, obj3) ) {
retractions.add(subj3, inPropertyGroupProp, obj3);
logger.log("Removed statement " + ABoxUpdater.stmtString(subj3, inPropertyGroupProp, obj3) + " from the knowledge base.");
}
if (retractions.size() > 0) {
siteModel.remove(retractions);
record.recordRetractions(retractions);
}
} finally {
siteModel.leaveCriticalSection();
}
}
} }