NIHVIVO-1724 Display core:hrJobTitle if there is no rdfs:label on the position
This commit is contained in:
parent
86c27039b0
commit
b99b656236
2 changed files with 6 additions and 2 deletions
|
@ -11,6 +11,7 @@
|
|||
|
||||
SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName)
|
||||
?positionTitle
|
||||
?hrJobTitle
|
||||
?org ?orgName
|
||||
?dateTimeStart ?dateTimeEnd WHERE {
|
||||
?subject ?property ?position
|
||||
|
@ -18,6 +19,7 @@
|
|||
?org rdfs:label ?orgName
|
||||
}
|
||||
OPTIONAL { ?position rdfs:label ?positionTitle }
|
||||
OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
|
||||
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
|
||||
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart
|
||||
|
@ -36,7 +38,8 @@
|
|||
|
||||
SELECT DISTINCT ?subclass
|
||||
?position (afn:localname(?position) AS ?positionName)
|
||||
?positionTitle
|
||||
?positionTitle
|
||||
?hrJobTitle
|
||||
?org ?orgName
|
||||
?dateTimeStart ?dateTimeEnd WHERE {
|
||||
?subject ?property ?position
|
||||
|
@ -44,6 +47,7 @@
|
|||
?org rdfs:label ?orgName
|
||||
}
|
||||
OPTIONAL { ?position rdfs:label ?positionTitle }
|
||||
OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
|
||||
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
|
||||
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart
|
||||
|
|
|
@ -20,6 +20,6 @@
|
|||
</#if>
|
||||
</#local>
|
||||
|
||||
<@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
|
||||
<@s.join [ linkedIndividual, statement.positionTitle!statement.hrJobTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
|
||||
|
||||
</#macro>
|
Loading…
Add table
Reference in a new issue