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,16 +34,12 @@
?object a foaf:Person . ?object a foaf:Person .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type . ?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 . OPTIONAL { ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj . ?vcard vcard:hasTitle ?titleObj .
?titleObj vcard:title ?title ?titleObj vcard:title ?title
} }
<collated> <collated>
OPTIONAL { ?object a ?subclass } OPTIONAL { ?object a ?subclass }
@ -62,6 +58,7 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?object . ?subject ?property ?object .
?object a ?objectType .
?object a ?subclass . ?object a ?subclass .
?object rdfs:label ?label . ?object rdfs:label ?label .
} WHERE { } WHERE {
@ -69,7 +66,8 @@
?subject ?property ?object . ?subject ?property ?object .
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .
?object a ?subclass . ?object a ?objectType .
?object a ?subclass .
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .
?object rdfs:label ?label . ?object rdfs:label ?label .
@ -87,8 +85,6 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?object . ?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
?object obo:ARG_2000028 ?vcard . ?object obo:ARG_2000028 ?vcard .
?vcard vcard:hasTitle ?titleObj . ?vcard vcard:hasTitle ?titleObj .
@ -96,10 +92,10 @@
} WHERE { } WHERE {
{ {
?subject ?property ?object . ?subject ?property ?object .
} UNION {
?subject ?property ?object .
?object vitro:mostSpecificType ?typeUri . ?object vitro:mostSpecificType ?typeUri .
?typeUri rdfs:label ?type . ?typeUri rdfs:label ?type .
?typeUri vitro:inClassGroup ?classGroup .
?classGroup a vitro:ClassGroup
} UNION { } UNION {
?subject ?property ?object . ?subject ?property ?object .
?object obo:ARG_2000028 ?vcard . ?object obo:ARG_2000028 ?vcard .