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

should fix the cause of NIHVIVO-393

Browse source
This commit is contained in:
bjl23 2010-07-12 17:33:36 +00:00
parent 0e0b32837c
commit b451ccc184
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
package edu.cornell.mannlib.vitro.webapp.ontology.update;
import java.io.IOException;
import java.util.List;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Literal;
@ -107,8 +108,22 @@ public class TBoxUpdater {
NodeIterator newObjects = newTboxAnnotationsModel.listObjectsOfProperty(subject, predicate);
if ((newObjects == null) || (!newObjects.hasNext()) ) {
retractions.add(siteModel.listStatements(subject, predicate, (RDFNode) null));
continue;
// first check to see if the site has a local value change
// that should override the deletion
List<RDFNode> siteObjects = siteModel.listObjectsOfProperty(subject, predicate).toList();
if (siteObjects.size() > 1) {
logger.logError("Error: found " + siteObjects.size() +
" statements with subject = " + subject.getURI() +
" and property = " + predicate.getURI() +
" in the site database. (maximum of one is expected)");
}
if (siteObjects.size() > 0) {
RDFNode siteNode = siteObjects.get(0);
if (siteNode.equals(oldObject)) {
retractions.add(siteModel.listStatements(subject, predicate, (RDFNode) null));
}
}
continue;
}
RDFNode newObject = newObjects.next();