summaryrefslogtreecommitdiff
path: root/chimere/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/urls.py')
-rw-r--r--chimere/urls.py25
1 files changed, 14 insertions, 11 deletions
diff --git a/chimere/urls.py b/chimere/urls.py
index 799f03f..804949a 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -56,20 +56,23 @@ for area in url_areas:
'simple':True}),)
extra = "|".join([area.urn for area in url_areas])
+default_dct = {}
if extra:
- extra = "(%s)?/?" % extra
+ extra = "(?P<area_name>%s)?/?" % extra
+else:
+ default_dct = {'area_name':''}
urlpatterns += patterns('chimere.main.views',
-(base + extra + r'contact/$', 'contactus'),
-(base + extra + r'edit/$', 'edit'),
-(base + extra + r'edit_route/$', 'editRoute'),
-(base + extra + r'submited/(\w+)/$', 'submited'),
-(base + extra + r'getDetail/(?P<marker_id>\d+)/$', 'getDetail'),
+(base + extra + r'contact/$', 'contactus', default_dct),
+(base + extra + r'edit/$', 'edit', default_dct),
+(base + extra + r'edit_route/$', 'editRoute', default_dct),
+(base + extra + r'submited/(\w+)/$', 'submited', default_dct),
+(base + extra + r'getDetail/(?P<marker_id>\d+)/$', 'getDetail', default_dct),
(base + extra + r'getDescriptionDetail/(?P<category_id>\d+)/$',
- 'getDescriptionDetail'),
+ 'getDescriptionDetail', default_dct),
(base + extra + r'getGeoObjects/(?P<category_ids>\w+)(/(?P<status>\w+))?$',
- 'getGeoObjects'),
+ 'getGeoObjects', default_dct),
(base + extra + r'getAvailableCategories/(?P<area>\w+)(/(?P<status>\w+))?(/(?P<force>\w+))?$',
- 'getAvailableCategories'),
-(base + extra + r'getTinyUrl/(.*)$', 'getTinyfiedUrl'),
-(base + extra + r'ty/(\w+)$', 'redirectFromTinyURN'),
+ 'getAvailableCategories', default_dct),
+(base + extra + r'getTinyUrl/(?P<parameters>.*)$', 'getTinyfiedUrl', default_dct),
+(base + extra + r'ty/(?P<tiny_urn>\w+)$', 'redirectFromTinyURN', default_dct),
)