diff --git a/resolverway/templates/list.html b/resolverway/templates/list.html index d709ab4..4186e6f 100644 --- a/resolverway/templates/list.html +++ b/resolverway/templates/list.html @@ -2,11 +2,11 @@ - NASA/ADS Search (Beta Interface) + NASA/ADS Search
-

NASA/ADS Search (Beta Interface)

+

NASA/ADS Search


diff --git a/resolverway/tests/unittests/stubdata/data.py b/resolverway/tests/unittests/stubdata/data.py index 2307051..180732d 100644 --- a/resolverway/tests/unittests/stubdata/data.py +++ b/resolverway/tests/unittests/stubdata/data.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -html_data = '''\n\n\n \n NASA/ADS Search (Beta Interface)\n\n\n
\n

NASA/ADS Search (Beta Interface)

\n
\n
\n
\n \n

links for 1987gady.book.....B

\n
\n \n
http://arxiv.org/abs/1307.6556
\n \n
\n \n
http://arxiv.org/pdf/1307.6556
\n \n
\n \n
http://dx.doi.org/10.1093%2Fmnras%2Fstt1379
\n \n
\n \n
http://mnras.oxfordjournals.org/content/435/3/1904.full.pdf
\n \n
\n \n
\n \n
\n \n\n\n''' +html_data = '''\n\n\n \n NASA/ADS Search\n\n\n
\n

NASA/ADS Search

\n
\n
\n
\n \n

links for 1987gady.book.....B

\n
\n \n
http://arxiv.org/abs/1307.6556
\n \n
\n \n
http://arxiv.org/pdf/1307.6556
\n \n
\n \n
http://dx.doi.org/10.1093%2Fmnras%2Fstt1379
\n \n
\n \n
http://mnras.oxfordjournals.org/content/435/3/1904.full.pdf
\n \n
\n \n
\n \n
\n \n\n\n''' diff --git a/resolverway/views.py b/resolverway/views.py index 04f9921..55167d3 100644 --- a/resolverway/views.py +++ b/resolverway/views.py @@ -28,6 +28,10 @@ def __init__(self, bibcode, link_type, url): self.access_token = None self.referrer = None + def redirect(self, link): + response = redirect(link, 302) + response.autocorrect_location_header = False + return response, 302 def process_resolver_response(self, the_json_response): action = the_json_response.get('action', '') @@ -38,7 +42,7 @@ def process_resolver_response(self, the_json_response): if link: current_app.logger.info('redirecting to %s' %(link)) log_request(self.bibcode, self.username, self.link_type, link, self.referrer, self.client_id, self.access_token) - return redirect(link, 302), 302 + return self.redirect(link) # when action is to display, there are more than one link, so render template to display links if (action == 'display'): @@ -48,7 +52,7 @@ def process_resolver_response(self, the_json_response): if records: current_app.logger.debug('rendering template with data %s' %(records)) log_request(self.bibcode, self.username, self.link_type, self.url, self.referrer, self.client_id, self.access_token) - return render_template('list.html', link_type=self.link_type.title(), + return render_template('list.html', url="", link_type=self.link_type.title(), links=records, bibcode=self.bibcode), 200 # if we get here there is an error, so display error template @@ -77,7 +81,7 @@ def process_request(self): if (self.url != None): current_app.logger.debug('received to redirect to %s' %(self.url)) log_request(self.bibcode, self.username, self.link_type, self.url, self.referrer, self.client_id, self.access_token) - return redirect(self.url, 302), 302 + return self.redirect(self.url) try: # if no url then send request to resolver_service to get link(s)