Browse Source

semi colon item and queries browse publisher artist

master
jules 3 years ago
parent
commit
9ad1f24863
  1. 10
      daapinterface.py
  2. 4
      templates/item.html

10
daapinterface.py

@ -136,8 +136,7 @@ def browsebycategory():
@app.route("/artistsindex") @app.route("/artistsindex")
def artistsindex(): def artistsindex():
sparql.setQuery(''' sparql.setQuery('''
SELECT ?creators ?creatorsLabel ?creatorsAltLabel ?creatorsDescription SELECT ?creators ?creatorsLabel ?creatorsAltLabel ?creatorsDescription WHERE {
WHERE {
{ {
SELECT ?creators (COUNT(DISTINCT ?a) AS ?count) WHERE { SELECT ?creators (COUNT(DISTINCT ?a) AS ?count) WHERE {
?a ?prop ?creators . ?a ?prop ?creators .
@ -151,10 +150,11 @@ def artistsindex():
} }
FILTER (?creators !=wd:Q82) FILTER (?creators !=wd:Q82)
} }
ORDER BY DESC(?count) ?creatorsLabel ORDER BY ?creatorsLabel
''') ''')
sparql.setReturnFormat(JSON) sparql.setReturnFormat(JSON)
results = sparql.query().convert() results = sparql.query().convert()
print(results)
return render_template('artistsindex.html', results=results) return render_template('artistsindex.html', results=results)
######################### PUBLISHERS INDEX ######################### PUBLISHERS INDEX
@ -166,8 +166,10 @@ def publishersindex():
SELECT ?publishers (COUNT(DISTINCT ?a) AS ?count) WHERE { SELECT ?publishers (COUNT(DISTINCT ?a) AS ?count) WHERE {
?a ?prop ?publishers . ?a ?prop ?publishers .
?a wdt:P1 ?work . ?a wdt:P1 ?work .
?publishers wdt:P1 ?typeofpublisher.
BIND (wdt:P10 AS ?prop) . BIND (wdt:P10 AS ?prop) .
BIND (wd:Q1 AS ?work) . BIND (wd:Q1 AS ?work)
BIND (wd:Q12 AS ?typeofpublisher).
} GROUP BY ?publishers } GROUP BY ?publishers
} . } .
SERVICE wikibase:label { SERVICE wikibase:label {

4
templates/item.html

@ -176,7 +176,7 @@
<!-- else loop through available data --> <!-- else loop through available data -->
{% for x in orglocation['results']['bindings'] %} {% for x in orglocation['results']['bindings'] %}
<span>{{ x['locationLabel']['value'] }} <span>{{ x['locationLabel']['value'] }}
{{ ", " if not loop.last else "" }} {{ "; " if not loop.last else "" }}
</span> </span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -192,7 +192,7 @@
{% for x in orgcountry['results']['bindings'] %} {% for x in orgcountry['results']['bindings'] %}
<span>{{ x['countryLabel']['value'] }} <span>{{ x['countryLabel']['value'] }}
{% if not loop.last %} {% if not loop.last %}
, ;
{% endif %} {% endif %}
</span> </span>
{% endfor %} {% endfor %}

Loading…
Cancel
Save