From: philipp Date: Sat, 29 Jun 2013 21:42:08 +0000 (+0000) Subject: The google bot used the URL X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/wrfeed.git/commitdiff_plain/046164496fa74304f1bb1afa582863e78ba4148f The google bot used the URL http://www.winterrodeln.org/feed/berichte/bahnen/22+42+132""" to access the feed - that lead to a ValueError. Fixed. git-svn-id: http://www.winterrodeln.org/svn/wrfeed/trunk@1485 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- diff --git a/setup.py b/setup.py index 4a64a9a..b960757 100644 --- a/setup.py +++ b/setup.py @@ -7,8 +7,8 @@ except ImportError: setup( name='wrfeed', - version='0.1.6', - description='Provides Atom Feed for Winterrodeln snow reports', + version='0.1.7', + description='Provides Atom Feed for Winterrodeln sledrun reports', author='Philipp Spitzer', author_email='philipp.spitzer@winterrodeln.org', url='http://www.winterrodeln.org/trac', diff --git a/wrfeed/controllers/berichte.py b/wrfeed/controllers/berichte.py index 01d634c..e081494 100644 --- a/wrfeed/controllers/berichte.py +++ b/wrfeed/controllers/berichte.py @@ -129,20 +129,32 @@ def create_feed(page_title=None, page_ids=None): class BerichteController(BaseController): def alle(self): - """http://www.winterrodeln.org/feed/berichte/alle""" + """Handles URLs like + http://127.0.0.1:5000/berichte/alle + http://www.winterrodeln.org/feed/berichte/alle + """ response.content_type = 'application/atom+xml' return create_feed() def bahn(self, id): - """http://www.winterrodeln.org/feed/berichte/bahn/kemater_alm""" + """Handles URLs like + http://127.0.0.1:5000/berichte/bahn/kemater_alm + http://www.winterrodeln.org/feed/berichte/bahn/kemater_alm + """ response.content_type = 'application/atom+xml' return create_feed(page_title=id) def bahnen(self, id): - """http://www.winterrodeln.org/feed/berichte/bahnen/22+42+132""" + """Handles URLs like + http://127.0.0.1:5000/berichte/bahnen/22+42+132 + http://www.winterrodeln.org/feed/berichte/bahnen/22+42+132 + """ page_ids = id.split('+') - page_ids = [int(page_id) for page_id in page_ids] + try: + page_ids = [int(page_id) for page_id in page_ids] + except ValueError: + abort(400) # bad request response.content_type = 'application/atom+xml' return create_feed(page_ids=page_ids)