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

NIHVIVO-216

Browse source
This commit is contained in:
sjm222 2010-04-01 20:31:06 +00:00
parent 2f21b9c535
commit 679d43a633
1 changed files with 87 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

175
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
View file

@ -387,6 +387,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
updateProperty(prop,getOntModel()); updateProperty(prop,getOntModel());
} }
public void updateProperty(ObjectProperty prop, OntModel ontModel) { public void updateProperty(ObjectProperty prop, OntModel ontModel) {
if (prop.getURI()==null || prop.getURI().length()<3) { if (prop.getURI()==null || prop.getURI().length()<3) {
return; return;
@ -400,20 +401,24 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
} }
com.hp.hpl.jena.ontology.ObjectProperty inv = null; com.hp.hpl.jena.ontology.ObjectProperty inv = null;
if (hasInverse(prop)) { if (hasInverse(prop)) {
try { try {
inv = ontModel.getObjectProperty(prop.getURIInverse()); inv = ontModel.getObjectProperty(prop.getURIInverse());
inv.setInverseOf(p);
p.setInverseOf(inv); if (!inv.isInverseOf(p)) {
} catch (Exception e) { inv.setInverseOf(p);
System.out.println("Couldn't set "+prop.getURIInverse()+" as inverse"); p.setInverseOf(inv);
// BJL: What we really want to do here is create a new property as inverse }
} } catch (Exception e) {
System.out.println("Couldn't set "+prop.getURIInverse()+" as inverse");
// BJL: What we really want to do here is create a new property as inverse
}
} }
try {
doUpdate(prop,p,inv,ontModel); try {
} catch (Exception e) { doUpdate(prop,p,inv,ontModel);
e.printStackTrace(); } catch (Exception e) {
} e.printStackTrace();
}
} finally { } finally {
getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),false)); getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),false));
ontModel.leaveCriticalSection(); ontModel.leaveCriticalSection();
@ -422,31 +427,30 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
/* This method assumes that the caller is locking and unlocking the model */ /* This method assumes that the caller is locking and unlocking the model */
private void doUpdate(ObjectProperty prop, OntProperty p, OntProperty inv, OntModel ontModel) { private void doUpdate(ObjectProperty prop, OntProperty p, OntProperty inv, OntModel ontModel) {
if (inv != null) {
if ((prop.getRangePublic() != null) && (prop.getRangePublic().length() > 0)) { updateRDFSLabel(p,prop.getDomainPublic());
inv.setLabel(prop.getRangePublic(), (String) getDefaultLanguage());
} else { if (inv != null) {
inv.removeAll(RDFS.label); updateRDFSLabel(inv,prop.getRangePublic());
}
} }
try { try {
if (p.getSuperProperty() != null) {
p.removeSuperProperty(p.getSuperProperty());
}
String parentURI = prop.getParentURI(); String parentURI = prop.getParentURI();
if (parentURI != null) { if (parentURI != null) {
com.hp.hpl.jena.ontology.ObjectProperty parent = ontModel.getObjectProperty(prop.getParentURI()); com.hp.hpl.jena.ontology.ObjectProperty parent = ontModel.getObjectProperty(prop.getParentURI());
if (parent != null) { if (parent != null) {
p.addSuperProperty(parent);
if (!p.hasSuperProperty(parent, true)) {
p.addSuperProperty(parent);
}
if (inv != null) { if (inv != null) {
OntProperty parentInv = parent.getInverse(); OntProperty parentInv = parent.getInverse();
if (inv.getSuperProperty() != null) {
if (inv.getSuperProperty() != null) {
inv.removeSuperProperty(inv.getSuperProperty());
}
}
if (parentInv != null) { if (parentInv != null) {
inv.setSuperProperty(parentInv); if (!inv.hasSuperProperty(parentInv,true)) {
inv.setSuperProperty(parentInv);
}
} }
} }
} }
@ -456,10 +460,12 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
// plus, this whole section needs reworking // plus, this whole section needs reworking
log.error("Unable to update parent property for "+prop.getURI(), e); log.error("Unable to update parent property for "+prop.getURI(), e);
} }
if (prop.getTransitive()) { if (prop.getTransitive()) {
if (!getOntModel().contains(p,RDF.type,OWL.TransitiveProperty)) { if (!getOntModel().contains(p,RDF.type,OWL.TransitiveProperty)) {
getOntModel().add(p,RDF.type,OWL.TransitiveProperty); getOntModel().add(p,RDF.type,OWL.TransitiveProperty);
} }
if ( (inv != null) && (!getOntModel().contains(inv,RDF.type,OWL.TransitiveProperty))) { if ( (inv != null) && (!getOntModel().contains(inv,RDF.type,OWL.TransitiveProperty))) {
getOntModel().add(inv,RDF.type,OWL.TransitiveProperty); getOntModel().add(inv,RDF.type,OWL.TransitiveProperty);
} }
@ -471,6 +477,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
getOntModel().remove(inv,RDF.type,OWL.TransitiveProperty); getOntModel().remove(inv,RDF.type,OWL.TransitiveProperty);
} }
} }
if (prop.getSymmetric()) { if (prop.getSymmetric()) {
if (!getOntModel().contains(p,RDF.type,OWL.SymmetricProperty)) { if (!getOntModel().contains(p,RDF.type,OWL.SymmetricProperty)) {
getOntModel().add(p,RDF.type,OWL.SymmetricProperty); getOntModel().add(p,RDF.type,OWL.SymmetricProperty);
@ -486,6 +493,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
getOntModel().remove(inv,RDF.type,OWL.SymmetricProperty); getOntModel().remove(inv,RDF.type,OWL.SymmetricProperty);
} }
} }
if (prop.getFunctional()) { if (prop.getFunctional()) {
if (!getOntModel().contains(p,RDF.type,OWL.FunctionalProperty)) { if (!getOntModel().contains(p,RDF.type,OWL.FunctionalProperty)) {
getOntModel().add(p,RDF.type,OWL.FunctionalProperty); getOntModel().add(p,RDF.type,OWL.FunctionalProperty);
@ -495,6 +503,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
getOntModel().remove(p,RDF.type,OWL.FunctionalProperty); getOntModel().remove(p,RDF.type,OWL.FunctionalProperty);
} }
} }
if (prop.getInverseFunctional()) { if (prop.getInverseFunctional()) {
if (!getOntModel().contains(p,RDF.type,OWL.InverseFunctionalProperty)) { if (!getOntModel().contains(p,RDF.type,OWL.InverseFunctionalProperty)) {
getOntModel().add(p,RDF.type,OWL.InverseFunctionalProperty); getOntModel().add(p,RDF.type,OWL.InverseFunctionalProperty);
@ -504,35 +513,48 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
getOntModel().remove(p,RDF.type,OWL.InverseFunctionalProperty); getOntModel().remove(p,RDF.type,OWL.InverseFunctionalProperty);
} }
} }
/* 3/29/2010 sjm. Commenting out per bjl. As far as we can tell from looking at the code, these fields
* are no longer used by the application. Leaving this here commented out for now though,
* just in case. Also, we deprecated the fields in ObjectProperty.java
if (prop.getDomainSidePhasedOut() != null) { if (prop.getDomainSidePhasedOut() != null) {
updatePropertyStringValue(p,PROPERTY_FULLPROPERTYNAMEANNOT,prop.getDomainSidePhasedOut(),ontModel); updatePropertyStringValue(p,PROPERTY_FULLPROPERTYNAMEANNOT,prop.getDomainSidePhasedOut(),ontModel);
} }
if (prop.getRangeSidePhasedOut() != null && inv != null) { if (prop.getRangeSidePhasedOut() != null && inv != null) {
updatePropertyStringValue(inv,PROPERTY_FULLPROPERTYNAMEANNOT,prop.getRangeSidePhasedOut(),ontModel); updatePropertyStringValue(inv,PROPERTY_FULLPROPERTYNAMEANNOT,prop.getRangeSidePhasedOut(),ontModel);
} }
if (prop.getDomainPublic() != null && prop.getDomainPublic().length() > 0) { */
p.setLabel(prop.getDomainPublic(), (String) getDefaultLanguage());
} else {
p.removeAll(RDFS.label);
}
p.removeAll(RDFS.domain);
if (inv != null) {
inv.removeAll(RDFS.range);
}
if ( (prop.getDomainVClassURI() != null) && (prop.getDomainVClassURI().length()>0) ) { if ( (prop.getDomainVClassURI() != null) && (prop.getDomainVClassURI().length()>0) ) {
p.setDomain(ontModel.getResource(prop.getDomainVClassURI())); if (!p.hasDomain(ontModel.getResource(prop.getDomainVClassURI()))) {
if (inv != null) p.setDomain(ontModel.getResource(prop.getDomainVClassURI()));
inv.setRange(p.getDomain()); if (inv != null) {
} inv.setRange(p.getDomain());
p.removeAll(RDFS.range); }
if (inv != null) { }
inv.removeAll(RDFS.domain); } else {
p.removeAll(RDFS.domain);
if (inv != null) {
inv.removeAll(RDFS.range);
}
} }
if ( (prop.getRangeVClassURI() != null) && (prop.getRangeVClassURI().length()>0) ) { if ( (prop.getRangeVClassURI() != null) && (prop.getRangeVClassURI().length()>0) ) {
p.setRange(ontModel.getResource(prop.getRangeVClassURI())); if (!p.hasRange(ontModel.getResource(prop.getRangeVClassURI()))) {
if (inv != null) p.setRange(ontModel.getResource(prop.getRangeVClassURI()));
inv.setDomain(p.getRange()); if (inv != null) {
inv.setDomain(p.getRange());
}
}
} else {
p.removeAll(RDFS.range);
if (inv != null) {
inv.removeAll(RDFS.domain);
}
} }
updatePropertyStringValue(p,EXAMPLE_ANNOT,prop.getExample(),getOntModel()); updatePropertyStringValue(p,EXAMPLE_ANNOT,prop.getExample(),getOntModel());
updatePropertyStringValue(p,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel()); updatePropertyStringValue(p,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel());
updatePropertyStringValue(p,PUBLIC_DESCRIPTION_ANNOT,prop.getPublicDescription(),getOntModel()); updatePropertyStringValue(p,PUBLIC_DESCRIPTION_ANNOT,prop.getPublicDescription(),getOntModel());
@ -542,33 +564,21 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
if (inv != null) { if (inv != null) {
updatePropertyStringValue(inv,EXAMPLE_ANNOT,prop.getExample(),getOntModel()); updatePropertyStringValue(inv,EXAMPLE_ANNOT,prop.getExample(),getOntModel());
updatePropertyStringValue(inv,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel()); updatePropertyStringValue(inv,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel());
//updatePropertyStringValue(inv,PUBLIC_DESCRIPTION_ANNOT,prop.getPublicDescription(),getOntModel());
updatePropertyNonNegativeIntValue(inv,DISPLAY_LIMIT,prop.getRangeDisplayLimit(),getOntModel()); updatePropertyNonNegativeIntValue(inv,DISPLAY_LIMIT,prop.getRangeDisplayLimit(),getOntModel());
updatePropertyStringValue(inv,PROPERTY_ENTITYSORTFIELD,prop.getRangeEntitySortField(),getOntModel()); updatePropertyStringValue(inv,PROPERTY_ENTITYSORTFIELD,prop.getRangeEntitySortField(),getOntModel());
updatePropertyStringValue(inv,PROPERTY_ENTITYSORTDIRECTION,prop.getRangeEntitySortDirection(),getOntModel()); updatePropertyStringValue(inv,PROPERTY_ENTITYSORTDIRECTION,prop.getRangeEntitySortDirection(),getOntModel());
} }
if (DISPLAY_RANK_ANNOT != null) {
try { if (prop.getDomainDisplayTier() != null) {
p.removeAll(DISPLAY_RANK_ANNOT); updatePropertyNonNegativeIntValue(p,DISPLAY_RANK_ANNOT,Integer.decode(prop.getDomainDisplayTier()),getOntModel());
if (prop.getDomainDisplayTier() != null) {
int domainDisplayTierInt = Integer.decode(prop.getDomainDisplayTier()); if (inv != null) {
if (domainDisplayTierInt > -1) { if (prop.getRangeDisplayTier() != null) {
p.addProperty(DISPLAY_RANK_ANNOT, prop.getDomainDisplayTier(), XSDDatatype.XSDint); updatePropertyNonNegativeIntValue(inv,DISPLAY_RANK_ANNOT,Integer.decode(prop.getRangeDisplayTier()),getOntModel());
}
} }
} catch (NumberFormatException e) {} }
if (inv != null) { }
try {
inv.removeAll(DISPLAY_RANK_ANNOT);
if (prop.getRangeDisplayTier() != null) {
int rangeDisplayTierInt = Integer.decode(prop.getRangeDisplayTier());
if (rangeDisplayTierInt >-1) {
inv.addProperty(DISPLAY_RANK_ANNOT, prop.getRangeDisplayTier(), XSDDatatype.XSDint);
}
}
} catch (NumberFormatException e) {}
}
}
String oldObjectIndividualSortPropertyURI = null; String oldObjectIndividualSortPropertyURI = null;
RDFNode sortPropertyNode = p.getPropertyValue(PROPERTY_OBJECTINDIVIDUALSORTPROPERTY); RDFNode sortPropertyNode = p.getPropertyValue(PROPERTY_OBJECTINDIVIDUALSORTPROPERTY);
if (sortPropertyNode != null && sortPropertyNode instanceof Resource) { if (sortPropertyNode != null && sortPropertyNode instanceof Resource) {
@ -591,14 +601,12 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
} }
} }
p.removeAll(HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT); if (prop.getHiddenFromDisplayBelowRoleLevel() != null) {
if (HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT != null && prop.getHiddenFromDisplayBelowRoleLevel() != null) { // only need to add if present updatePropertyResourceURIValue(p, HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT, prop.getHiddenFromDisplayBelowRoleLevel().getURI());
p.addProperty(HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT, ResourceFactory.createResource(prop.getHiddenFromDisplayBelowRoleLevel().getURI()));
} }
p.removeAll(PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT); if (prop.getProhibitedFromUpdateBelowRoleLevel() != null) {
if (PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT != null && prop.getProhibitedFromUpdateBelowRoleLevel() != null) { // only need to add if present updatePropertyResourceURIValue(p, PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT, prop.getProhibitedFromUpdateBelowRoleLevel().getURI());
p.addProperty(PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT, ResourceFactory.createResource(prop.getProhibitedFromUpdateBelowRoleLevel().getURI()));
} }
updatePropertyStringValue(p,PROPERTY_CUSTOMENTRYFORMANNOT,prop.getCustomEntryForm(),ontModel); updatePropertyStringValue(p,PROPERTY_CUSTOMENTRYFORMANNOT,prop.getCustomEntryForm(),ontModel);
@ -606,19 +614,8 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
updatePropertyBooleanValue(p,PROPERTY_OFFERCREATENEWOPTIONANNOT,prop.getOfferCreateNewOption(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE); updatePropertyBooleanValue(p,PROPERTY_OFFERCREATENEWOPTIONANNOT,prop.getOfferCreateNewOption(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE);
updatePropertyBooleanValue(p,PROPERTY_STUBOBJECTPROPERTYANNOT,prop.getStubObjectRelation(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE); updatePropertyBooleanValue(p,PROPERTY_STUBOBJECTPROPERTYANNOT,prop.getStubObjectRelation(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE);
updatePropertyBooleanValue(p,PROPERTY_COLLATEBYSUBCLASSANNOT,prop.getCollateBySubclass(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE); updatePropertyBooleanValue(p,PROPERTY_COLLATEBYSUBCLASSANNOT,prop.getCollateBySubclass(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE);
try {
p.removeAll(PROPERTY_INPROPERTYGROUPANNOT); updatePropertyResourceURIValue(p, PROPERTY_INPROPERTYGROUPANNOT, prop.getGroupURI());
if (prop.getGroupURI() != null && prop.getGroupURI().length()>0) {
String badURIErrorStr = checkURI(prop.getGroupURI());
if (badURIErrorStr == null) {
p.addProperty(PROPERTY_INPROPERTYGROUPANNOT, getOntModel().getResource(prop.getGroupURI()));
} else {
log.error(badURIErrorStr);
}
}
} catch (Exception e) {
log.error("error linking object property "+prop.getURI()+" to property group");
}
} }
public void deleteObjectProperty(ObjectProperty prop) { public void deleteObjectProperty(ObjectProperty prop) {