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

VIVO-326 collate by subclass for qualified properties

Browse source
This commit is contained in:
brianjlowe 2013-10-09 14:28:18 -04:00
parent 5994979ebd
commit 2417555e1c
1 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,6 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
p.setURIInverse(invOp.getURI()); p.setURIInverse(invOp.getURI());
p.setNamespaceInverse(invOp.getNameSpace()); p.setNamespaceInverse(invOp.getNameSpace());
p.setLocalNameInverse(invOp.getLocalName()); p.setLocalNameInverse(invOp.getLocalName());
String invPropertyName = getPropertyStringValue(invOp,PROPERTY_FULLPROPERTYNAMEANNOT);
p.setRangePublic(getLabelOrId(invOp)); p.setRangePublic(getLabelOrId(invOp));
} }
try { try {
@ -296,6 +295,9 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
"PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n" + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n" +
"SELECT ?range ?label ?group ?customForm ?displayRank ?displayLevel " + "SELECT ?range ?label ?group ?customForm ?displayRank ?displayLevel " +
" ?updateLevel ?editLinkSuppressed ?addLinkSuppressed ?deleteLinkSuppressed \n" + " ?updateLevel ?editLinkSuppressed ?addLinkSuppressed ?deleteLinkSuppressed \n" +
" ?collateBySubclass ?displayLimit ?individualSortProperty \n" +
" ?entitySortDirection ?selectFromExisting ?offerCreateNew \n" +
" ?publicDescription \n" +
" WHERE { \n" + " WHERE { \n" +
" ?context config:configContextFor <" + propertyURI + "> . \n"; " ?context config:configContextFor <" + propertyURI + "> . \n";
if (domainURI != null) { if (domainURI != null) {
@ -317,6 +319,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
" OPTIONAL { ?configuration vitro:customEntryFormAnnot ?customForm } \n" + " OPTIONAL { ?configuration vitro:customEntryFormAnnot ?customForm } \n" +
" OPTIONAL { ?configuration vitro:hiddenFromDisplayBelowRoleLevelAnnot ?displayLevel } \n" + " OPTIONAL { ?configuration vitro:hiddenFromDisplayBelowRoleLevelAnnot ?displayLevel } \n" +
" OPTIONAL { ?configuration vitro:prohibitedFromUpdateBelowRoleLevelAnnot ?updateLevel } \n" + " OPTIONAL { ?configuration vitro:prohibitedFromUpdateBelowRoleLevelAnnot ?updateLevel } \n" +
" OPTIONAL { ?configuration <" + PROPERTY_COLLATEBYSUBCLASSANNOT.getURI() + "> ?collateBySubclass } \n" +
" OPTIONAL { ?configuration <" + DISPLAY_LIMIT.getURI() + "> ?displayLimit } \n" +
" OPTIONAL { ?configuration <" + PROPERTY_OBJECTINDIVIDUALSORTPROPERTY.getURI() + "> ?individualSortProperty } \n " +
" OPTIONAL { ?configuration <" + PROPERTY_ENTITYSORTDIRECTION.getURI() + "> ?entitySortDirection } \n" +
" OPTIONAL { ?configuration <" + PROPERTY_SELECTFROMEXISTINGANNOT.getURI() + "> ?selectFromExisting } \n" +
" OPTIONAL { ?configuration <" + PROPERTY_OFFERCREATENEWOPTIONANNOT.getURI() + "> ?offerCreateNew } \n" +
" OPTIONAL { ?configuration <" + PUBLIC_DESCRIPTION_ANNOT.getURI() + "> ?publicDescription } \n" +
"}"; "}";
Query q = QueryFactory.create(propQuery); Query q = QueryFactory.create(propQuery);
@ -334,6 +343,11 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
op.setDomainDisplayTier( op.setDomainDisplayTier(
Integer.parseInt(displayRankLit.getLexicalForm())); Integer.parseInt(displayRankLit.getLexicalForm()));
} }
Literal displayLimitLit = qsoln.getLiteral("displayLimit");
if(displayLimitLit != null) {
op.setDomainDisplayLimit(
Integer.parseInt(displayLimitLit.getLexicalForm()));
}
Resource displayLevelRes = qsoln.getResource("displayLevel"); Resource displayLevelRes = qsoln.getResource("displayLevel");
if (displayLevelRes != null) { if (displayLevelRes != null) {
op.setHiddenFromDisplayBelowRoleLevel( op.setHiddenFromDisplayBelowRoleLevel(
@ -366,6 +380,30 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
if (deleteLinkSuppressedLit != null ) { if (deleteLinkSuppressedLit != null ) {
op.setDeleteLinkSuppressed(deleteLinkSuppressedLit.getBoolean()); op.setDeleteLinkSuppressed(deleteLinkSuppressedLit.getBoolean());
} }
Literal collateBySubclassLit = qsoln.getLiteral("collateBySubclass");
if (collateBySubclassLit != null) {
op.setCollateBySubclass(collateBySubclassLit.getBoolean());
}
Resource individualSortPropertyRes = qsoln.getResource("individualSortProperty");
if (individualSortPropertyRes != null) {
op.setObjectIndividualSortPropertyURI(individualSortPropertyRes.getURI());
}
Literal entitySortDirectionLit = qsoln.getLiteral("entitySortDirection");
if (entitySortDirectionLit != null) {
op.setDomainEntitySortDirection(entitySortDirectionLit.getLexicalForm());
}
Literal selectFromExistingLit = qsoln.getLiteral("selectFromExisting");
if (selectFromExistingLit != null) {
op.setSelectFromExisting(selectFromExistingLit.getBoolean());
}
Literal offerCreateNewLit = qsoln.getLiteral("offerCreateNew");
if (offerCreateNewLit != null) {
op.setOfferCreateNewOption(offerCreateNewLit.getBoolean());
}
Literal publicDescriptionLit = qsoln.getLiteral("publicDescription");
if (publicDescriptionLit != null) {
op.setPublicDescription(publicDescriptionLit.getLexicalForm());
}
} }
} finally { } finally {
qe.close(); qe.close();