diff options
Diffstat (limited to 'chimere/urls.py')
| -rw-r--r-- | chimere/urls.py | 82 |
1 files changed, 29 insertions, 53 deletions
diff --git a/chimere/urls.py b/chimere/urls.py index 41a3729..6aebf72 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2011 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2008-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -17,70 +17,46 @@ # See the file COPYING for details. - +from django.conf import settings from django.conf.urls.defaults import * - from django.contrib import admin admin.autodiscover() -from settings import ROOT_PATH, EXTRA_URL, INSTALLED_APPS - -from main.models import Area +from chimere.models import Area def i18n_javascript(request): return admin.site.i18n_javascript(request) -BASE = '^' + EXTRA_URL -urlpatterns = patterns('', - (BASE + r'admin/jsi18n/$', i18n_javascript), - (BASE + r'admin/(.*)', admin.site.root), - (BASE + r'static/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': ROOT_PATH + 'static/'}), - (BASE + r'media/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': ROOT_PATH + 'media/'}), - (BASE + r'charte/$', 'chimere.main.views.charte'), +urlpatterns = patterns('chimere.views', + url(r'^simple(/?P<area_name>\w+)?$', 'index', {'simple':True}, + name="simple_index") ) -urlpatterns += patterns('chimere.main.views', +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+)?/?submited/(?P<action>\w+)/?$', 'submited', + name="submit"), + url(r'^(?P<area_name>\w+)?/?edit/?$', 'edit', + name="edit"), + url(r'^(?P<area_name>\w+)?/?edit_route/?$', 'editRoute', + name="edit_route"), + url(r'^(?P<area_name>\w+)?/?getDetail/(?P<marker_id>\d+)/?$', 'getDetail', + name="get_detail"), + url(r'^(?P<area_name>\w+)?/?getDescriptionDetail/?(?P<category_id>\d+)/?$', + 'getDescriptionDetail', name="get_description_detail"), + url(r'^(?:(?P<area_name>\w+)?/)?getGeoObjects/(?P<category_ids>\w+)(/(?P<status>\w+))?$', + 'getGeoObjects', name="getgeoobjects"), + url(r'^(?P<area_name>\w+)?/?getAvailableCategories/$', + 'get_available_categories', name="get_categories"), + url(r'^(?P<area_name>\w+)?/?ty/(?P<tiny_urn>\w+)$', + 'redirectFromTinyURN', name="tiny"), ) -url_areas = Area.objects.filter(urn__isnull=False) -urlpatterns += patterns('chimere.main.views', (BASE + r'$', 'index'), - (BASE + r'simple/?$', 'index', {'simple':True}) ) - -for area in url_areas: - urlpatterns += patterns('chimere.main.views', - (BASE + '(' + area.urn + ')/?$', 'index', {'default_area':area}), - (BASE + '(' + area.urn + ')/simple/?$', 'index', {'default_area':area, - 'simple':True}),) - -EXTRA = "|".join([area.urn for area in url_areas]) -default_dct = {} -EXTRA_NO_AREA = EXTRA -if EXTRA: - EXTRA_NO_AREA = "(%s)?/?" % EXTRA - EXTRA = "(?P<area_name>%s)?/?" % EXTRA -else: - default_dct = {'area_name':''} -urlpatterns += patterns('chimere.main.views', -(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'upload_file/((?P<category_id>\w+)/)?$', 'uploadFile', - default_dct), -(BASE + EXTRA + r'process_route_file/(?P<file_id>\d+)/$', 'processRouteFile', default_dct), -(BASE + EXTRA + r'submited/(?P<action>\w+)/$', 'submited', default_dct), -(BASE + EXTRA + r'getDetail/(?P<marker_id>\d+)/$', 'getDetail', default_dct), -(BASE + EXTRA + r'getDescriptionDetail/(?P<category_id>\d+)/$', - 'getDescriptionDetail', default_dct), -(BASE + EXTRA + r'getGeoObjects/(?P<category_ids>\w+)(/(?P<status>\w+))?$', - 'getGeoObjects', default_dct), -(BASE + EXTRA + r'getAvailableCategories/((?P<area>\w+))?(/(?P<status>\w+))?(/(?P<force>\w+))?$', - 'getAvailableCategories', default_dct), -(BASE + EXTRA + r'ty/(?P<tiny_urn>\w+)$', 'redirectFromTinyURN', default_dct), +# At the end, because it catches large +urlpatterns += patterns('chimere.views', + url(r'^(?P<area_name>\w+)?', 'index', name="index"), ) -if 'chimere.rss' in INSTALLED_APPS: - urlpatterns += patterns('', - (r'^' + EXTRA_URL, include('chimere.rss.urls')),) + |