jules/DAAP_interface
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modifs lozana queries and link home gif

Browse Source
This commit is contained in:
jules 2020-11-15 20:58:30 +01:00
parent 70a5ee7ac0
commit b884492efe
4 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
daapinterface.py
View File

@ -37,16 +37,18 @@ sparql3 = SPARQLWrapper("https://query.daap.bannerrepeater.org/proxy/wdqs/bigdat
@app.route("/") @app.route("/")
def home(): def home():
sparql.setQuery(''' sparql.setQuery('''
SELECT ?work ?workLabel ?image ?date WHERE { SELECT ?work ?workLabel ?image ?date ?dateadded WHERE {
SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
?work wdt:P1 wd:Q1. ?work wdt:P1 wd:Q1;
OPTIONAL { ?work p:P30 ?statement. wdt:P87 ?dateadded.
?work p:P30 ?statement.
?statement ps:P30 ?image; ?statement ps:P30 ?image;
pq:P54 wd:Q90.} pq:P54 wd:Q90.
OPTIONAL { ?work wdt:P13 ?date. } ?work wdt:P13 ?date.
FILTER(?work != wd:Q57) FILTER(?work != wd:Q57)
} }
ORDER BY (?workLabel) ORDER BY (?dateadded)
LIMIT 12
''') ''')
sparql.setReturnFormat(JSON) sparql.setReturnFormat(JSON)
results = sparql.query().convert() results = sparql.query().convert()
@ -157,13 +159,17 @@ def publishersindex():
@app.route("/selfpublishedindex") @app.route("/selfpublishedindex")
def selfpublishedindex(): def selfpublishedindex():
sparql.setQuery(''' sparql.setQuery('''
SELECT ?work ?workLabel ?workAltLabel ?workDescription SELECT ?work ?workLabel ?image ?date
WHERE { WHERE {
SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
?work wdt:P1 wd:Q1; ?work wdt:P1 wd:Q1;
wdt:P10 wd:Q71. wdt:P10 wd:Q71.
FILTER(?work != wd:Q57) OPTIONAL {?work p:P30 ?statement.
} ?statement ps:P30 ?image;
pq:P54 wd:Q90.}
OPTIONAL { ?work wdt:P13 ?date. }
FILTER(?work != wd:Q57)
}
''') ''')
sparql.setReturnFormat(JSON) sparql.setReturnFormat(JSON)
results = sparql.query().convert() results = sparql.query().convert()
@ -173,16 +179,21 @@ def selfpublishedindex():
@app.route("/zinesindex") @app.route("/zinesindex")
def zinesindex(): def zinesindex():
sparql.setQuery(''' sparql.setQuery('''
SELECT ?work ?workLabel ?workAltLabel ?workDescription SELECT ?work ?workLabel ?image ?date
WHERE { WHERE {
SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
?work wdt:P1 wd:Q1; ?work wdt:P1 wd:Q1;
wdt:P16 wd:Q152. wdt:P10 wd:Q71.
FILTER(?work != wd:Q57) OPTIONAL {?work p:P30 ?statement.
} ?statement ps:P30 ?image;
pq:P54 wd:Q90.}
OPTIONAL { ?work wdt:P13 ?date. }
FILTER(?work != wd:Q57)
}
''') ''')
sparql.setReturnFormat(JSON) sparql.setReturnFormat(JSON)
results = sparql.query().convert() results = sparql.query().convert()
print(results)
return render_template('zinesindex.html', results=results) return render_template('zinesindex.html', results=results)
@ -342,7 +353,7 @@ def artwork():
# text=soup.find_all("p") # text=soup.find_all("p")
artworkdescriptiontext=Markup(text) artworkdescriptiontext=Markup(text)
print(artworkdescriptiontext) print(artworkdescriptiontext)
############ right bottom LATER ############ right bottom LATER

3
templates/home.html
View File

@ -33,8 +33,7 @@
</div> </div>
<div id="wrapper-vid"> <div id="wrapper-vid">
<video preload="meta" autoplay="" loop=""> <video preload="meta" autoplay="" loop="">
<source src="{{ url_for('static', filename='/vid/DAAP_video_update.mp4') }}" type="video/mp4">
<source src="{{ url_for('static', filename='/vid/archive-links-video-temp.mp4') }}" type="video/mp4">
</video> </video>
</div> </div>
</div> </div>

3
templates/layout.html
View File

@ -13,7 +13,8 @@
<div id="header"> <div id="header">
<div id="animatedlogo"> <div id="animatedlogo">
<img src="{{ url_for('static', filename='/imgs/Logos/DAAP BR square logo -Animated Image (Small).gif') }}"> <a href="{{ url_for('home') }}">
<img src="{{ url_for('static', filename='/imgs/Logos/DAAP BR square logo -Animated Image (Small).gif') }}"></a>
</div> </div>
<div id="title-nav"> <div id="title-nav">
<div id="header-top"> <div id="header-top">

14
templates/tutorials.html
View File

@ -1,15 +1,13 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block content %} {% block content %}
<div id="tutorials-intro"> {{ text }}
<h3>TUTORIALS</h3>
<p>Tutorials page upcoming</p>
</div>
<div id="tutorials-content">
<div id="tutorials-content-left"></div>
<div id="tutorials-content-right"></div>
</div>
<style type="text/css">
div#toc{
display: none
}
</style>
{% endblock content %} {% endblock content %}