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

VIVO-965: list view changes so that non-faux properties will be collated correctly

Browse source
This commit is contained in:
Tim Worrall 2015-02-09 17:13:16 -05:00
parent b3c5aaa794
commit a7541643f4
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
productMods/config/listViewConfig-default.xml
View file

@ -31,11 +31,10 @@
OPTIONAL { OPTIONAL {
# Get mostSpecificType only for Persons # Get mostSpecificType only for Persons
?object a foaf:Person . ?object vitro:mostSpecificType ?subclass .
?object vitro:mostSpecificType ?typeUri . ?subclass rdfs:label ?type .
?typeUri rdfs:label ?type .
# Display only a mostSpecificType that belongs to a classgroup. # Display only a mostSpecificType that belongs to a classgroup.
?typeUri vitro:inClassGroup ?classGroup . ?subclass vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup ?classGroup a vitro:ClassGroup
} }
@ -45,7 +44,6 @@
} }
<collated> <collated>
OPTIONAL { ?object a ?subclass }
FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
</collated> </collated>
@ -62,7 +60,6 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?object . ?subject ?property ?object .
?object a ?objectType . ?object a ?objectType .
?object a ?subclass .
?object rdfs:label ?label . ?object rdfs:label ?label .
} WHERE { } WHERE {
{ {
@ -86,10 +83,10 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?object . ?subject ?property ?object .
?object a ?objectType . ?object a ?objectType .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?subclass .
?typeUri vitro:inClassGroup ?classGroup . ?subclass vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup . ?classGroup a vitro:ClassGroup .
?typeUri rdfs:label ?type . ?subclass rdfs:label ?type .
?object obo:ARG_2000028 ?vcard . ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj . ?vcard vcard:hasTitle ?titleObj .
?titleObj vcard:title ?title ?titleObj vcard:title ?title
@ -100,9 +97,9 @@
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .
?object a ?objectType . ?object a ?objectType .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?subclass .
?typeUri rdfs:label ?type . ?subclass rdfs:label ?type .
?typeUri vitro:inClassGroup ?classGroup . ?subclass vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup ?classGroup a vitro:ClassGroup
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .

8
productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
View file

@ -9,8 +9,12 @@
<@showStatement statement /> <@showStatement statement />
<#macro showStatement statement> <#macro showStatement statement>
<#-- The query retrieves a type only for Persons. Post-processing will remove all but one. --> <#-- The query retrieves a type only for Persons. Post-processing will remove all but one. -->
<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>&nbsp; ${statement.title!statement.type!} <#if statement.subclass??>
<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>
<#else>
<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>&nbsp; ${statement.title!statement.type!}
</#if>
</#macro> </#macro>