backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

Double-quoting XmlQueryIndexSource lookups for #29

Browse Source 
The OpenWayback reference implementation of this API relies on doubly-escaped queries. This change should bring this implementation into line with OutbackCDX and OWB's original API.
This commit is contained in:
Andy Jackson 2019-02-27 15:01:33 +00:00 committed by John Berlin
parent 54a4e38531
commit c00f30e897
No known key found for this signature in database
GPG Key ID: 6EF5E4B442011B02
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pywb/warcserver/index/indexsource.py
View File

@ -222,8 +222,6 @@ class RemoteIndexSource(BaseIndexSource):
# ============================================================================= # =============================================================================
class XmlQueryIndexSource(BaseIndexSource): class XmlQueryIndexSource(BaseIndexSource):
EXACT_SUFFIX = '?q=type:urlquery+url:{url}'
PREFIX_SUFFIX = '?q=type:prefixquery+url:{url}'
def __init__(self, query_api_url): def __init__(self, query_api_url):
self.query_api_url = query_api_url self.query_api_url = query_api_url
@ -237,14 +235,12 @@ class XmlQueryIndexSource(BaseIndexSource):
matchType = params.get('matchType', 'exact') matchType = params.get('matchType', 'exact')
if matchType == 'exact': if matchType == 'exact':
query_url = self.query_api_url + self.EXACT_SUFFIX query_url = self.query_api_url + '?q=' + quote_plus('type:urlquery+url:' + quote_plus(url))
elif matchType == 'prefix': elif matchType == 'prefix':
query_url = self.query_api_url + self.PREFIX_SUFFIX query_url = self.query_api_url + '?q=' + quote_plus('type:prefixquery+url:' + quote_plus(url))
else: else:
raise BadRequestException('matchType={0} is not supported'.format(matchType=matchType)) raise BadRequestException('matchType={0} is not supported'.format(matchType=matchType))
query_url = query_url.format(url=quote_plus(url))
try: try:
response = self.session.get(query_url) response = self.session.get(query_url)
response.raise_for_status() response.raise_for_status()