edward/depicts
1
0
Fork 0
Code Issues 8 Pull requests Packages Projects Releases Wiki Activity

Handle malformed browse parameters

Browse source 
Examples:

* https://art.wikidata.link/browse?P1433%27[0]=Q28861951
* https://art.wikidata.link/browse?P1433=Q28861951%27[0]
This commit is contained in:
Edward Betts 2020-06-30 14:17:54 +01:00
parent 117459bb8f
commit 8c715fe148
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app.py
View file

@ -25,6 +25,7 @@ import json
import os import os
import locale import locale
import socket import socket
import re
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8') locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
user_agent = 'Mozilla/5.0 (X11; Linux i586; rv:32.0) Gecko/20160101 Firefox/32.0' user_agent = 'Mozilla/5.0 (X11; Linux i586; rv:32.0) Gecko/20160101 Firefox/32.0'
@ -77,6 +78,9 @@ isa_list = [
'Q46686' # reredos 'Q46686' # reredos
] ]
re_qid = re.compile(r'^Q(\d+)')
re_pid = re.compile(r'^P(\d+)')
@app.teardown_appcontext @app.teardown_appcontext
def shutdown_session(exception=None): def shutdown_session(exception=None):
database.session.remove() database.session.remove()
@ -524,11 +528,15 @@ def get_labels_db(keys):
labels = {} labels = {}
missing = set() missing = set()
for qid in keys: for qid in keys:
item = Item.query.get(qid[1:]) m = re_qid.match(qid)
if item: if m:
labels[qid] = item.label item_id = int(m.group(1))
else: item = Item.query.get(item_id)
missing.add(qid) if item:
labels[qid] = item.label
continue
missing.add(qid)
page_size = 50 page_size = 50
try: try:
@ -708,8 +716,20 @@ def get_facets(params):
} }
def get_artwork_params(): def get_artwork_params():
return [(pid, qid) for pid, qid in request.args.items() params = []
if pid.startswith('P') and qid.startswith('Q')] for pid, qid in request.args.items():
m = re_pid.match(pid)
if not m:
continue
pid = m.group(0)
m = re_qid.match(qid)
if not m:
continue
qid = m.group(0)
params.append((pid, qid))
return params
def filter_artwork(params): def filter_artwork(params):
return wdqs.run_from_template_with_cache('query/find_more.sparql', return wdqs.run_from_template_with_cache('query/find_more.sparql',