Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2014-05-14 16:57:27 -04:00
commit 536d8b4b2c

View file

@ -10,6 +10,7 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
SELECT DISTINCT <collated> ?subclass </collated> SELECT DISTINCT <collated> ?subclass </collated>
?authorship ?authorship
@ -28,6 +29,17 @@
} }
</collated> </collated>
} }
OPTIONAL { ?authorship core:relates ?author .
?author a vcard:Kind .
?author rdfs:label ?authorName
<collated>
OPTIONAL { ?authorship core:relates ?author .
?author a vcard:Kind .
?author vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf vcard:Kind
}
</collated>
}
<critical-data-required> <critical-data-required>
FILTER ( bound(?author) ) FILTER ( bound(?author) )
</critical-data-required> </critical-data-required>
@ -74,5 +86,45 @@
} }
</query-construct> </query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
CONSTRUCT {
?subject ?property ?authorship .
?authorship a core:Authorship .
?authorship ?authorshipProperty ?authorshipValue .
?authorship core:relates ?author .
?author a vcard:Kind .
?author rdfs:label ?authorName .
?author vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf vcard:Kind
} WHERE {
{
?subject ?property ?authorship .
?authorship a core:Authorship
} UNION {
?subject ?property ?authorship .
?authorship a core:Authorship .
?authorship ?authorshipProperty ?authorshipValue
} UNION {
?subject ?property ?authorship .
?authorship a core:Authorship .
?authorship core:relates ?author .
?author a vcard:Kind .
?author rdfs:label ?authorName
} UNION {
?subject ?property ?authorship .
?authorship a core:Authorship .
?authorship core:relates ?author .
?author a vcard:Kind .
?author rdfs:label ?authorName .
?author vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf vcard:Kind
}
}
</query-construct>
<template>propStatement-informationResourceInAuthorship.ftl</template> <template>propStatement-informationResourceInAuthorship.ftl</template>
</list-view-config> </list-view-config>