From 1c578d180a1de7f438917fcd4025e5be09d95ee0 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Tue, 24 Jul 2012 10:41:23 +0200
Subject: Urls: manage areas with "-" and "_"

---
 chimere/urls.py | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/chimere/urls.py b/chimere/urls.py
index 66bf47d..7d680da 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -31,52 +31,52 @@ def i18n_javascript(request):
 
 
 urlpatterns = patterns('chimere.views',
-    url(r'^simple(/?P<area_name>\w+)?$', 'index', {'simple':True},
+    url(r'^simple(/?P<area_name>[a-zA-Z0-9_-]+)?$', 'index', {'simple':True},
         name="simple_index")
 )
 
 if settings.CHIMERE_FEEDS:
     urlpatterns += patterns('',
-        url(r'^(?P<area_name>\w+/)?feeds$', 'chimere.views.rss',
+        url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds$', 'chimere.views.rss',
             name='feeds-form'),
-        url(r'^(?P<area_name>\w+/)?feeds/category/(?P<category_id>\d+)$',
+        url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/category/(?P<category_id>\d+)$',
             LatestPOIsByCategory(), name='feeds-cat'),
-        url(r'^(?P<area_name>\w+/)?feeds/subcategory/(?P<category_id>\d+)$',
+        url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/subcategory/(?P<category_id>\d+)$',
             LatestPOIsBySubCategory(), name='feeds-subcat'),
-        url(r'^(?P<area_name>\w+/)?feeds/global/$', LatestPOIs(),
+        url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/global/$', LatestPOIs(),
             name='feeds-global'),
-        url(r'^(?P<area_name>\w+/)?feeds/area/(?P<area>[0-9-_.]+)$',
+        url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/area/(?P<area>[0-9-_.]+)$',
             LatestPOIsByZone(), name='feeds-area'),
-        url(r'^(?P<area_name>\w+/)?feeds/areaid/(?P<area_id>\d+)$',
+        url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/areaid/(?P<area_id>\d+)$',
             LatestPOIsByZoneID(), name='feeds-areaid'),
     )
 
 urlpatterns += patterns('chimere.views',
     url(r'^charte/?$', 'charte', name="charte"),
-    url(r'^(?P<area_name>\w+/)?contact/?$', 'contactus', name="contact"),
-    url(r'^(?P<area_name>\w+/)?edit/$', 'edit',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?contact/?$', 'contactus', name="contact"),
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'edit',
         name="edit"),
-    url(r'^(?P<area_name>\w+/)?edit/(?P<item_id>\w+)/(?P<submited>\w+)?$',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/(?P<submited>\w+)?$',
             'edit', name="edit-item"),
-    url(r'^(?P<area_name>\w+/)?edit-route/$', 'editRoute',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$', 'editRoute',
         name="editroute"),
-    url(r'^(?P<area_name>\w+/)?edit-route/(?P<item_id>\w+)/(?P<submited>\w+)?$',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/(?P<submited>\w+)?$',
         'editRoute', name="editroute-item"),
-    url(r'^(?P<area_name>\w+/)?getDetail/(?P<marker_id>\d+)/?$', 'getDetail',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/(?P<marker_id>\d+)/?$', 'getDetail',
         name="get_detail"),
-    url(r'^(?P<area_name>\w+/)?getDescriptionDetail/?(?P<category_id>\d+)/?$',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDescriptionDetail/?(?P<category_id>\d+)/?$',
                         'getDescriptionDetail', name="get_description_detail"),
-    url(r'^(?P<area_name>\w+/)?getGeoObjects/'\
-        r'(?P<category_ids>\w+)(/(?P<status>\w+))?$', 'getGeoObjects',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getGeoObjects/'\
+        r'(?P<category_ids>[a-zA-Z0-9_-]+)(/(?P<status>\w+))?$', 'getGeoObjects',
                         name="getgeoobjects"),
-    url(r'^(?P<area_name>\w+/)?getAvailableCategories/$',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAvailableCategories/$',
                         'get_available_categories', name="get_categories"),
-    url(r'^(?P<area_name>\w+/)?ty/(?P<tiny_urn>\w+)$',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?ty/(?P<tiny_urn>\w+)$',
                         'redirectFromTinyURN', name="tiny"),
-    url(r'^(?P<area_name>\w+/)?upload_file/((?P<category_id>\w+)/)?$',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?upload_file/((?P<category_id>\w+)/)?$',
                         'uploadFile', name='upload_file'),
-    url(r'^(?P<area_name>\w+/)?process_route_file/(?P<file_id>\d+)/$',
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?process_route_file/(?P<file_id>\d+)/$',
                         'processRouteFile', name='process_route_file'),
     # At the end, because it catches large
-    url(r'^(?P<area_name>\w+)?', 'index', name="index"),
+    url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', 'index', name="index"),
 )
-- 
cgit v1.2.3