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

updates to list view queries and constructs; includes fix for VIVO-399

Browse source
This commit is contained in:
tworrall 2013-10-22 13:14:58 -04:00
parent 55670d67dd
commit 48cf67e98a
20 changed files with 77 additions and 323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
languages/example/themes/wilma/i18n/all_es.properties
View file

@ -109,6 +109,7 @@ websites = Websites
advisee_label = etiqueta aconsejado
advisor_label = etiqueta asesor
candidate = candidato
candidate = candidatura
advisingRel_label = Etiqueta de advertencia
editor_abbreviated = Ed.

14
productMods/config/listViewConfig-additionalEmail.xml
View file

@ -7,12 +7,13 @@
<query-select>
PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
SELECT DISTINCT ?vcard ?email
SELECT DISTINCT ?vcard
?email
?emailAddress
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email
OPTIONAL { ?email vcard:email ?emailAddress }
?vcard vcard:hasEmail ?email .
?email vcard:email ?emailAddress
MINUS {?email a vcard:Work}
}
</query-select>
@ -24,17 +25,10 @@
?vcard vcard:hasEmail ?email .
?email ?emailProperty ?emailValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email ?emailProperty ?emailValue
}
}
</query-construct>
<template>propStatement-emailAddress.ftl</template>

74
productMods/config/listViewConfig-adviseeIn.xml
View file

@ -33,14 +33,11 @@
OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel }
OPTIONAL { ?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
?advisorRole a core:AdvisorRole .
OPTIONAL { ?advisor rdfs:label ?advisorLabel }
}
OPTIONAL { ?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
OPTIONAL { ?degree rdfs:label ?degreeLabel }
OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
OPTIONAL { ?advisingRel core:degreeCandidacy ?degree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
}
<collated>
OPTIONAL { ?advisingRel vitro:mostSpecificType ?subclass .
@ -76,31 +73,18 @@
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel .
} WHERE {
{
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel
@ -118,15 +102,13 @@
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
?advisor rdfs:label ?advisorLabel .
?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
?advisor rdfs:label ?advisorLabel .
?advisorRole a core:AdvisorRole .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
?advisingRel core:degreeCandidacy ?degree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
} WHERE {
@ -134,23 +116,11 @@
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
?advisorRole a core:AdvisorRole
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
@ -161,27 +131,8 @@
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
?advisingRel core:degreeCandidacy ?degree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
}
@ -192,20 +143,20 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?advisingRel .
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
@ -215,11 +166,10 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE {
@ -228,7 +178,7 @@
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}

50
productMods/config/listViewConfig-advisorIn.xml
View file

@ -33,12 +33,10 @@
OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel }
OPTIONAL { ?advisingRel core:relates ?advisee .
?advisee a foaf:Person .
?advisee &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?adviseeRole .
?adviseeRole a core:AdviseeRole .
OPTIONAL { ?advisee rdfs:label ?adviseeLabel }
}
OPTIONAL { ?advisingRel core:degreeCandidacy ?degree .
OPTIONAL { ?degree rdfs:label ?degreeLabel }
?degree rdfs:label ?degreeLabel .
OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
}
<collated>
@ -75,33 +73,19 @@
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel .
} WHERE {
{
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel
}
}
@ -117,15 +101,13 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisee .
?advisee a foaf:Person .
?advisee rdfs:label ?adviseeLabel .
?advisee &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
?advisee rdfs:label ?adviseeLabel .
?advisingRel core:degreeCandidacy ?degree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
} WHERE {
@ -133,23 +115,11 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisee .
?advisee a foaf:Person .
?advisee &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?adviseeRole .
?adviseeRole a core:AdviseeRole
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisee .
?advisee a foaf:Person .
@ -160,11 +130,15 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:degreeCandidacy ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel .
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:degreeCandidacy ?degree .
?degree core:abbreviation ?degreeAbbr
}
}
@ -174,7 +148,6 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
@ -184,8 +157,8 @@
} WHERE {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisorRole core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
@ -197,7 +170,6 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
@ -207,8 +179,8 @@
} WHERE {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisorRole core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .

1
productMods/config/listViewConfig-authorInAuthorship.xml
View file

@ -131,7 +131,6 @@
?infoResource core:hasPublicationVenue ?publishedIn .
?publishedIn rdfs:label ?journal
}
}
</query-construct>

42
productMods/config/listViewConfig-awardOrHonor.xml
View file

@ -66,7 +66,9 @@
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel
?assignedBy rdfs:label ?assignedByLabel .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
{
?subject ?property ?awardReceipt .
@ -75,13 +77,6 @@
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
@ -96,19 +91,13 @@
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy
?award core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
}
</query-construct>
@ -146,22 +135,5 @@
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</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;
CONSTRUCT {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
</query-construct>
<template>propStatement-awardOrHonor.ftl</template>
</list-view-config>

29
productMods/config/listViewConfig-editorship.xml
View file

@ -60,7 +60,9 @@
?subject ?property ?editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource rdfs:label ?infoResourceName
?infoResource rdfs:label ?infoResourceName .
?infoResource core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
{
?subject ?property ?editorship .
@ -70,29 +72,9 @@
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt;
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource rdfs:label ?infoResourceName
} UNION {
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource rdfs:label ?infoResourceName
}
}
</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 bibo: &lt;http://purl.org/ontology/bibo/&gt;
CONSTRUCT {
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
@ -100,6 +82,7 @@
?infoResource core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
}
</query-construct>
<template>propStatement-editorship.ftl</template>

46
productMods/config/listViewConfig-educationalTraining.xml
View file

@ -11,9 +11,8 @@
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT <collated> ?subclass </collated>
SELECT DISTINCT ?subclass
?edTraining
?typeName
?org ?orgName
?degreeName ?degreeAbbr
?majorField ?deptOrSchool ?info
@ -21,10 +20,7 @@
WHERE {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess
OPTIONAL {?edTraining vitro:mostSpecificType ?subclass .
?trainingType rdfs:subClassOf core:EducationalProcess .
?trainingType rdfs:label ?typeName
}
OPTIONAL { ?edTraining vitro:mostSpecificType ?subclass . }
OPTIONAL { ?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
?awardedDegree core:relates ?degree .
?degree a core:AcademicDegree
@ -54,9 +50,11 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subclass rdfs:subClassOf core:EducationalProcess .
?edTraining vitro:mostSpecificType ?subclass
} WHERE {
?subclass rdfs:subClassOf core:EducationalProcess .
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?subclass .
}
</query-construct>
@ -86,11 +84,6 @@
?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
}
UNION {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
}
UNION {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
@ -143,33 +136,6 @@
}
</query-construct>
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining .
?trainingType rdfs:label ?typeName
} WHERE {
{
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining
} UNION
{
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining .
?trainingType rdfs:label ?typeName
}
}
</query-construct>
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;

13
productMods/config/listViewConfig-faxNumber.xml
View file

@ -12,9 +12,8 @@
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone a vcard:Fax
OPTIONAL { ?phone vcard:telephone ?number }
?phone a vcard:Fax .
?phone vcard:telephone ?number
}
</query-select>
@ -26,19 +25,11 @@
?phone a vcard:Fax .
?phone ?phoneProperty ?phoneValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone a vcard:Fax
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone a vcard:Fax .
?phone ?phoneProperty ?phoneValue
}
}
</query-construct>
<template>propStatement-phoneFaxNumber.ftl</template>

3
productMods/config/listViewConfig-fullName.xml
View file

@ -34,9 +34,6 @@
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasName ?fullName
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasName ?fullName .

52
productMods/config/listViewConfig-hasAttendeeRole.xml
View file

@ -175,24 +175,12 @@
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2 .
?event2 rdfs:label ?event2Label
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event2 &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
@ -221,13 +209,6 @@
?event2 rdfs:label ?event2Label
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
@ -235,13 +216,6 @@
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2 .
?event2 rdfs:label ?event2Label
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event2 &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
@ -270,24 +244,12 @@
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series .
?series rdfs:label ?seriesLabel
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?series &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
@ -315,13 +277,6 @@
?series rdfs:label ?seriesLabel
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
@ -329,13 +284,6 @@
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series .
?series rdfs:label ?seriesLabel
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?series &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event3 .
?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .

5
productMods/config/listViewConfig-hasEditorRole.xml
View file

@ -69,11 +69,6 @@
?role a core:EditorRole .
?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName .
} UNION {
?subject ?property ?role .
?role a core:EditorRole .
?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass
} UNION {
?subject ?property ?role .
?role a core:EditorRole .

12
productMods/config/listViewConfig-primaryEmail.xml
View file

@ -12,8 +12,8 @@
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email a vcard:Work
OPTIONAL { ?email vcard:email ?emailAddress }
?email a vcard:Work .
?email vcard:email ?emailAddress
}
</query-select>
@ -26,19 +26,11 @@
?email a vcard:Work .
?email ?emailProperty ?emailValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email a vcard:Work
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email a vcard:Work .
?email ?emailProperty ?emailValue
}
}
</query-construct>
<template>propStatement-emailAddress.ftl</template>

11
productMods/config/listViewConfig-telephoneNumber.xml
View file

@ -11,8 +11,8 @@
?number
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone
OPTIONAL { ?phone vcard:telephone ?number }
?vcard vcard:hasTelephone ?phone .
?phone vcard:telephone ?number
MINUS {?phone a vcard:Fax}
}
</query-select>
@ -24,17 +24,10 @@
?vcard vcard:hasTelephone ?phone .
?phone ?phoneProperty ?phoneValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone ?phoneProperty ?phoneValue
}
}
</query-construct>
<template>propStatement-phoneFaxNumber.ftl</template>

2
productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
View file

@ -22,7 +22,7 @@
</#if>
<#if statement.degreeLabel??>
${statement.degreeAbbr!statement.degreeLabel!}
<#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidate},<#else>&nbsp;${i18n().candidate}</#if>
<#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidacy},<#else>&nbsp;${i18n().candidacy}</#if>
</#if>
<#elseif statement.advisingRelLabel??>
<a href="${profileUrl(statement.uri("advisingRel"))}" title="${i18n().advisingRel_label}">${statement.advisingRelLabel!statement.localName}</a>

4
productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
View file

@ -15,9 +15,9 @@
<#local linkedIndividual>
<#if statement.award??>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!statement.localName!}</a>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!}</a>
<#else>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!statement.localName!}</a>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!}</a>
</#if>
</#local>

2
productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
View file

@ -24,5 +24,5 @@
</#local>
<#-- If property is collated, then subclass label is redundant information -->
${linkedIndividual} <#if ! property.collatedBySubclass>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
${linkedIndividual} <#if (! property.collatedBySubclass) && statement.subclassLabel?has_content>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
</#macro>

1
themes/wilma/i18n/all.properties
View file

@ -109,6 +109,7 @@ websites = Websites
advisee_label = advisee label
advisor_label = advisor label
candidate = candidate
candidacy = candidacy
advisingRel_label = advisory label
editor_abbreviated = Ed.