Revision a2c97d4c
| b/pithos/api/urls.py | ||
|---|---|---|
| 31 | 31 |
# interpreted as representing official policies, either expressed |
| 32 | 32 |
# or implied, of GRNET S.A. |
| 33 | 33 |
|
| 34 |
from django.conf.urls.defaults import *
|
|
| 34 |
from django.conf.urls.defaults import include, patterns
|
|
| 35 | 35 |
|
| 36 | 36 |
# TODO: This only works when in this order. |
| 37 |
urlpatterns = patterns('pithos.api.functions',
|
|
| 37 |
api_urlpatterns = patterns('pithos.api.functions',
|
|
| 38 | 38 |
(r'^$', 'top_demux'), |
| 39 | 39 |
(r'^(?P<v_account>.+?)/(?P<v_container>.+?)/(?P<v_object>.+?)$', 'object_demux'), |
| 40 | 40 |
(r'^(?P<v_account>.+?)/(?P<v_container>.+?)/?$', 'container_demux'), |
| 41 | 41 |
(r'^(?P<v_account>.+?)/?$', 'account_demux') |
| 42 | 42 |
) |
| 43 |
|
|
| 44 |
urlpatterns = patterns('',
|
|
| 45 |
(r'^v1(?:$|/)', include(api_urlpatterns)), |
|
| 46 |
(r'^v1\.0(?:$|/)', include(api_urlpatterns)), |
|
| 47 |
(r'^public/(?P<v_public>.+?)/?$', 'pithos.api.public.public_demux'), |
|
| 48 |
(r'^login/?$', 'pithos.api.login.redirect_to_login_service') |
|
| 49 |
) |
|
| b/pithos/urls.py | ||
|---|---|---|
| 35 | 35 |
|
| 36 | 36 |
|
| 37 | 37 |
urlpatterns = patterns('',
|
| 38 |
(r'^v1(?:$|/)', include('pithos.api.urls')),
|
|
| 39 |
(r'^v1\.0(?:$|/)', include('pithos.api.urls')),
|
|
| 40 |
(r'^public/(?P<v_public>.+?)/?$', 'pithos.api.public.public_demux'), |
|
| 41 |
(r'^login/?$', 'pithos.api.login.redirect_to_login_service'), |
|
| 42 |
(r'^ui', include('pithos.ui.urls'))
|
|
| 38 |
(r'', include('pithos.api.urls')),
|
|
| 43 | 39 |
) |
Also available in: Unified diff