Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2013-12-11 11:48:47 -05:00
commit ff78326b45

View file

@ -34,9 +34,6 @@
?object a foaf:Person .
?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type .
# Display only a mostSpecificType that belongs to a classgroup.
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup
}
OPTIONAL { ?object obo:ARG_2000028 ?vcard .
@ -44,7 +41,6 @@
?titleObj vcard:title ?title
}
<collated>
OPTIONAL { ?object a ?subclass }
FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
@ -62,6 +58,7 @@
CONSTRUCT {
?subject ?property ?object .
?object a ?objectType .
?object a ?subclass .
?object rdfs:label ?label .
} WHERE {
@ -69,6 +66,7 @@
?subject ?property ?object .
} UNION {
?subject ?property ?object .
?object a ?objectType .
?object a ?subclass .
} UNION {
?subject ?property ?object .
@ -87,8 +85,6 @@
CONSTRUCT {
?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup .
?typeUri rdfs:label ?type .
?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj .
@ -96,10 +92,10 @@
} WHERE {
{
?subject ?property ?object .
} UNION {
?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup
} UNION {
?subject ?property ?object .
?object obo:ARG_2000028 ?vcard .