diff --git a/daapinterface.py b/daapinterface.py index 133ef13..26d1538 100644 --- a/daapinterface.py +++ b/daapinterface.py @@ -70,7 +70,7 @@ ORDER BY (?workLabel) publication_date = publication["date"]["value"] if "image" in publication: publication_image = publication["image"]["value"] - return render_template('browsethearchive.html', results=results) + return render_template('home.html', results=results) @app.route("/browsethearchive") @@ -133,6 +133,7 @@ def artistsindex(): ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() + print(results) return render_template('artistsindex.html', results=results) ######################### PUBLISHERS INDEX diff --git a/templates/--layout.html b/templates/--layout.html new file mode 100644 index 0000000..67c2320 --- /dev/null +++ b/templates/--layout.html @@ -0,0 +1,78 @@ + + + + + + D.A.A.P + + + + + + + + + + + {% block content %} + {% endblock content %} + + + + + + + + + \ No newline at end of file diff --git a/templates/artistsindex.html b/templates/artistsindex.html index cc80b74..d43dcc3 100644 --- a/templates/artistsindex.html +++ b/templates/artistsindex.html @@ -15,8 +15,8 @@ {% for x in results['results']['bindings']%} - {{ x['creators']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }} - {{ x["creatorsLabel"]['value'] }} + {{ x['creators']['value'] | replace('http://wikibase.svc/entity/', '') }} + {{ x["creatorsLabel"]['value'] }} {% if "creatorsAltLabel" in x %} {{ x["creatorsAltLabel"]["value"] }} diff --git a/templates/browsethearchive.html b/templates/browsethearchive.html index 014c3f7..87787b9 100644 --- a/templates/browsethearchive.html +++ b/templates/browsethearchive.html @@ -9,15 +9,15 @@ {% for x in results['results']['bindings']%}
{% if "image" in x %} - +
{% else %} - +
{% endif %} - + {{ x["workLabel"]["value"]}}
{% if "date" in x %} diff --git a/templates/layout.html b/templates/layout.html index 67c2320..b58c47b 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -21,7 +21,7 @@ DIGITAL ARCHIVE OF ARTISTS' PUBLISHING
@@ -29,11 +29,11 @@ @@ -46,13 +46,13 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/templates/publishersindex.html b/templates/publishersindex.html index 0c37510..e47f218 100644 --- a/templates/publishersindex.html +++ b/templates/publishersindex.html @@ -15,8 +15,8 @@ {% for x in results['results']['bindings']%} - {{ x['publishers']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }} - {{ x["publishersLabel"]['value'] }} + {{ x['publishers']['value'] | replace('http://wikibase.svc/entity/', '') }} + {{ x["publishersLabel"]['value'] }} {% if "publishersAltLabel" in x %} {{ x["publishersAltLabel"]["value"] }} diff --git a/templates/selfpublishedindex.html b/templates/selfpublishedindex.html index 407fe98..cc0073c 100644 --- a/templates/selfpublishedindex.html +++ b/templates/selfpublishedindex.html @@ -15,8 +15,8 @@ {% for x in results['results']['bindings']%} - {{ x['work']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }} - {{ x["workLabel"]['value'] }} + {{ x['work']['value'] | replace('http://wikibase.svc/entity/', '') }} + {{ x["workLabel"]['value'] }} {% if "workAltLabel" in x %} {{ x["workAltLabel"]["value"] }} diff --git a/templates/zinesindex.html b/templates/zinesindex.html index 4feed32..268d582 100644 --- a/templates/zinesindex.html +++ b/templates/zinesindex.html @@ -15,8 +15,8 @@ {% for x in results['results']['bindings']%} - {{ x['work']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }} - {{ x["workLabel"]['value'] }} + {{ x['work']['value'] | replace('http://wikibase.svc/entity/', '') }} + {{ x["workLabel"]['value'] }} {% if "workAltLabel" in x %} {{ x["workAltLabel"]["value"] }}