Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Country of Birth only show modern-day countries and countries at author birthdate in reading stats #6550

Merged
merged 4 commits into from
May 23, 2022
Merged

Make Country of Birth only show modern-day countries and countries at author birthdate in reading stats #6550

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c02490e
Make Country of Birth only show modern-day countries in reading stats
cdrini May 13, 2022
aee659b
Also display country at author's birthdate
cdrini May 13, 2022
25e9766
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 13, 2022
6a7f92d
fixup
cdrini May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions openlibrary/plugins/openlibrary/js/readinglog_stats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,28 @@ export function init(config) {
$(window.render_excluded_works_list(excluded, config.works.length)).appendTo(container);
}

const defaultFieldRender = field => `OPTIONAL { ?x ${field.relation} ?${field.name}. }`;

const SPARQL_FIELDS = [
{ name: 'ethnic_group', type: 'uri', relation: 'wdt:P172' },
{ name: 'sex', type: 'uri', relation: 'wdt:P21' },
{ name: 'dob', type: 'literal', relation: 'wdt:P569' },
{ name: 'country_of_citizenship', type: 'uri', relation: 'wdt:P27' },
{ name: 'country_of_birth', type: 'uri', relation: 'wdt:P19/wdt:P131*/wdt:P17' },
{
name: 'country_of_birth',
type: 'uri',
relation: 'wdt:P19/wdt:P131*/wdt:P17',
render: field => `
OPTIONAL {
?x ${field.relation} ?${field.name}.
OPTIONAL { ?country_of_birth wdt:P571 ?country_inception. }
OPTIONAL { ?country_of_birth wdt:P576 ?country_dissolution. }
}
# Limit to modern-day countries or the country that existed at the time
# of the author's birth
FILTER(!BOUND(?country_dissolution) || !BOUND(?dob) || (?dob >= ?country_inception && ?dob <= ?country_dissolution) ).
`
},
];

function buildSparql(authors) {
Expand All @@ -132,7 +148,7 @@ export function init(config) {
wdt:P648 ?olid.

${
SPARQL_FIELDS.map(f => `OPTIONAL { ?x ${f.relation} ?${f.name}. }`)
SPARQL_FIELDS.map(f => (f.render || defaultFieldRender)(f))
.join('\n')
}

Expand Down