Replaced URL /feeds/* by /feed/* (see ticket #64).

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/wrfeed@711 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/setup.py b/setup.py
index 2530e9979b5ea22bfa0e5a6272ab1bab5f867430..6a537652a2453b48f6acc6eda07ff62d7715a0f7 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ except ImportError:
 
 setup(
     name='wrfeed',
-    version='0.1.1',
+    version='0.1.2',
     description='Provides Atom Feed for Winterrodeln snow reports',
     author='Philipp Spitzer',
     author_email='philipp.spitzer@winterrodeln.org',

diff --git a/wrfeed.egg-info/PKG-INFO b/wrfeed.egg-info/PKG-INFO
deleted file mode 100644 (file)
index 2713d38..0000000
--- a/wrfeed.egg-info/PKG-INFO
+++ /dev/null
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: wrfeed
-Version: 0.1.1dev-r611
-Summary: Provides Atom Feed for Winterrodeln snow reports
-Home-page: http://www.winterrodeln.org/trac
-Author: Philipp Spitzer
-Author-email: philipp.spitzer@winterrodeln.org
-License: UNKNOWN
-Description: UNKNOWN
-Platform: UNKNOWN

diff --git a/wrfeed.egg-info/SOURCES.txt b/wrfeed.egg-info/SOURCES.txt
deleted file mode 100644 (file)
index 835f0f9..0000000
--- a/wrfeed.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-MANIFEST.in
-README.txt
-ez_setup.py
-setup.cfg
-setup.py
-test.ini
-docs/index.txt
-wrfeed/__init__.py
-wrfeed/websetup.py
-wrfeed.egg-info/PKG-INFO
-wrfeed.egg-info/SOURCES.txt
-wrfeed.egg-info/dependency_links.txt
-wrfeed.egg-info/entry_points.txt
-wrfeed.egg-info/not-zip-safe
-wrfeed.egg-info/paster_plugins.txt
-wrfeed.egg-info/requires.txt
-wrfeed.egg-info/top_level.txt
-wrfeed/config/__init__.py
-wrfeed/config/deployment.ini_tmpl
-wrfeed/config/environment.py
-wrfeed/config/middleware.py
-wrfeed/config/routing.py
-wrfeed/controllers/__init__.py
-wrfeed/controllers/berichte.py
-wrfeed/controllers/error.py
-wrfeed/lib/__init__.py
-wrfeed/lib/app_globals.py
-wrfeed/lib/base.py
-wrfeed/lib/helpers.py
-wrfeed/model/__init__.py
-wrfeed/model/meta.py
-wrfeed/public/bg.png
-wrfeed/public/favicon.ico
-wrfeed/public/index.html
-wrfeed/public/pylons-logo.gif
-wrfeed/templates/__init__.py
-wrfeed/tests/__init__.py
-wrfeed/tests/test_models.py
-wrfeed/tests/functional/__init__.py
-wrfeed/tests/functional/test_berichte.py
\ No newline at end of file

diff --git a/wrfeed.egg-info/dependency_links.txt b/wrfeed.egg-info/dependency_links.txt
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/wrfeed.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/wrfeed.egg-info/entry_points.txt b/wrfeed.egg-info/entry_points.txt
deleted file mode 100644 (file)
index df47173..0000000
--- a/wrfeed.egg-info/entry_points.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-    [paste.app_factory]
-    main = wrfeed.config.middleware:make_app
-
-    [paste.app_install]
-    main = pylons.util:PylonsInstaller
-    
\ No newline at end of file

diff --git a/wrfeed.egg-info/not-zip-safe b/wrfeed.egg-info/not-zip-safe
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/wrfeed.egg-info/not-zip-safe
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/wrfeed.egg-info/paster_plugins.txt b/wrfeed.egg-info/paster_plugins.txt
deleted file mode 100644 (file)
index c24c7fe..0000000
--- a/wrfeed.egg-info/paster_plugins.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-PasteScript
-Pylons

diff --git a/wrfeed.egg-info/requires.txt b/wrfeed.egg-info/requires.txt
deleted file mode 100644 (file)
index a834800..0000000
--- a/wrfeed.egg-info/requires.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Pylons>=0.10
-SQLAlchemy>=0.5
-Genshi>=0.4
\ No newline at end of file

diff --git a/wrfeed.egg-info/top_level.txt b/wrfeed.egg-info/top_level.txt
deleted file mode 100644 (file)
index 54330f7..0000000
--- a/wrfeed.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-wrfeed

diff --git a/wrfeed/config/routing.py b/wrfeed/config/routing.py
index cb07750dcb0894fa661e8abbd24ece14af6260e1..312531789d9de524f9791870731b97836a43dfca 100644 (file)
--- a/wrfeed/config/routing.py
+++ b/wrfeed/config/routing.py
@@ -5,9 +5,9 @@ may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
 
 Format:
-    http://www.winterrodeln.org/feeds/berichte/alle
-    http://www.winterrodeln.org/feeds/berichte/bahn/kemater_alm
-    http://www.winterrodeln.org/feeds/berichte/bahnen/22+42+132 
+    http://www.winterrodeln.org/feed/berichte/alle
+    http://www.winterrodeln.org/feed/berichte/bahn/kemater_alm
+    http://www.winterrodeln.org/feed/berichte/bahnen/22+42+132 
 See:
     http://www.winterrodeln.org/trac/wiki/UrlSchema
 """

diff --git a/wrfeed/controllers/berichte.py b/wrfeed/controllers/berichte.py
index f8afb04794472f560fd630a4c2a7c6b93e4a3708..c4eba4642f48537a4c5f57876189359a65ae6d59 100644 (file)
--- a/wrfeed/controllers/berichte.py
+++ b/wrfeed/controllers/berichte.py
@@ -3,9 +3,9 @@
 """Creates an Atom-Feed for single or multiple winterrodeln sled reports.
 
 Format:
-    http://www.winterrodeln.org/feeds/berichte/alle
-    http://www.winterrodeln.org/feeds/berichte/bahn/kemater_alm
-    http://www.winterrodeln.org/feeds/berichte/bahnen/22+42+132 
+    http://www.winterrodeln.org/feed/berichte/alle
+    http://www.winterrodeln.org/feed/berichte/bahn/kemater_alm
+    http://www.winterrodeln.org/feed/berichte/bahnen/22+42+132 
 See:
     http://www.atompub.org/
     http://effbot.org/zone/element.htm
@@ -79,7 +79,7 @@ def create_feed(page_title=None, page_ids=None):
         entry_title.text = page_title
         entry.append(Element("link", rel="alternate", href=u"http://www.winterrodeln.org/wiki/{0}".format(page_title_url), type="text/html", hreflang="de"))
         entry_id = SubElement(entry, "id")
-        entry_id.text = u"http://www.winterrodeln.org/feeds/schneelage/{0}/{1}".format(page_title_url, id)
+        entry_id.text = u"http://www.winterrodeln.org/feed/schneelage/{0}/{1}".format(page_title_url, id)
         entry_updated = SubElement(entry, "updated")
         entry_updated.text = date_entry.isoformat() + "+01:00"
         if last_updated is None: last_updated = date_entry
@@ -115,19 +115,19 @@ def create_feed(page_title=None, page_ids=None):
 class BerichteController(BaseController):
 
     def alle(self):
-        """http://www.winterrodeln.org/feeds/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/feeds/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/feeds/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]
         response.content_type = 'application/atom+xml'