diff --git a/settings/old_urls.py b/settings/old_urls.py index 4f0b8213..f1479ac0 100644 --- a/settings/old_urls.py +++ b/settings/old_urls.py @@ -45,42 +45,112 @@ urlpatterns = patterns('', #url(r'^serv-personal-info.php$', old_redirect, {'redirect_url': '/service/staff/'}), # EXPO # city - url(r'^catalog/city-(?P)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), + url(r'^catalog/city-(?P.*)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/{month}/'}), + + url(r'^catalog/city-(?P.*)/theme-(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/theme-(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/page/{page}/'}), url(r'^catalog/city-(?P.*)/theme-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), + + url(r'^catalog/city-(?P.*)/theme-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/theme-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/page/{page}/'}), url(r'^catalog/city-(?P.*)/theme-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/'}), - url(r'^catalog/city-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}'}), - url(r'^catalog/city/(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}'}), - url(r'^catalog/city-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}'}), - url(r'^catalog/city/(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}'}), + + url(r'^catalog/city-(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}/'}), + + url(r'^catalog/city/(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/city/(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/city/(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}/'}), + + url(r'^catalog/city-(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/'}), + + + url(r'^catalog/city/(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/page/{page}/'}), + url(r'^catalog/city/(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/page/{page}/'}), + url(r'^catalog/city/(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/'}), + #----------------------------- url(r'^catalog/city-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/page/{page}/'}), + url(r'^catalog/city-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/page/{page}/'}), url(r'^catalog/city-(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/'}), + + # country - url(r'^catalog/country-(?P)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), + url(r'^catalog/country-(?P.*)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/{month}/page/{page}/'}), + url(r'^catalog/country-(?P.*)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/{month}/page/{page}/'}), + url(r'^catalog/country-(?P.*)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/{month}/'}), + url(r'^catalog/country-(?P.*)/theme-(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/page/{page}/'}), + url(r'^catalog/country-(?P.*)/theme-(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/page/{page}/'}), url(r'^catalog/country-(?P.*)/theme-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), + url(r'^catalog/country-(?P.*)/theme-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/page/{page}/'}), + url(r'^catalog/country-(?P.*)/theme-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/page/{page}/'}), url(r'^catalog/country-(?P.*)/theme-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/'}), + url(r'^catalog/country-(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/page/{page}/'}), + url(r'^catalog/country-(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/page/{page}/'}), url(r'^catalog/country-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/'}), + url(r'^catalog/country/(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/page/{page}/'}), + url(r'^catalog/country/(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/page/{page}/'}), url(r'^catalog/country/(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/'}), + url(r'^catalog/country-(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/page/{page}/'}), + url(r'^catalog/country-(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/page/{page}/'}), url(r'^catalog/country-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/'}), + url(r'^catalog/country/(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/page/{page}/'}), + url(r'^catalog/country/(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/page/{page}/'}), url(r'^catalog/country/(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/'}), url(r'^catalog/country/(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/page/{page}/'}), + url(r'^catalog/country/(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/page/{page}/'}), + url(r'^catalog/country-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/{country}/'}), + url(r'^catalog/country/(?P.*)/$', old_redirect, {'redirect_url': '/expo/country/{country}/'}), url(r'^catalog/country-(?P.*)/$', old_redirect, {'redirect_url': '/expo/country/{country}/'}), + url(r'^catalog/country/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/country/page/{page}/'}), url(r'^catalog/country/$', old_redirect, {'redirect_url': '/expo/country/'}), # theme + url(r'^catalog/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/{month}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/{month}/page/{page}/'}), url(r'^catalog/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/{month}/'}), + url(r'^catalog/theme-(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/page/{page}/'}), url(r'^catalog/theme-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/'}), - url(r'^catalog/theme-(?P.*)/city-(?P)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/{month}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/{month}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/page/{page}/'}), url(r'^catalog/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/page/{page}/'}), url(r'^catalog/theme-(?P.*)/city-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/'}), - url(r'^catalog/theme-(?P.*)/country-(?P)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P.*)/year-(?P\d+)/month-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/{month}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P.*)/year-(?P\d+)/month-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/{month}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/{month}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P.*)/year-(?P\d+)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P.*)/year-(?P\d+)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/page/{page}/'}), url(r'^catalog/theme-(?P.*)/country-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/page/{page}/'}), url(r'^catalog/theme-(?P.*)/country-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/'}), + url(r'^catalog/theme/(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/page/{page}/'}), + url(r'^catalog/theme/(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/page/{page}'}), url(r'^catalog/theme/(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/'}), + url(r'^catalog/theme-(?P.*)/page-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/page/{page}/'}), + url(r'^catalog/theme-(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/page/{page}/'}), url(r'^catalog/theme-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/'}), url(r'^catalog/theme/$', old_redirect, {'redirect_url': '/expo/theme/'}), # tag + + + url(r'^tags.php/theme/(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/tag/{tag}/'}), + url(r'^tags.php/theme/(?P.*)/$', old_redirect, {'redirect_url': '/expo/tag/{tag}/'}), + url(r'^tag/(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/tag/{tag}/page/{page}/'}), url(r'^tag/(?P.*)/$', old_redirect, {'redirect_url': '/expo/tag/{tag}/'}), + + url(r'^catalog/(?P.*)/page/(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/page/{page}/'}), url(r'^catalog/(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/'}), url(r'^catalog/$', old_redirect, {'redirect_url': '/expo/city/'}), # tag diff --git a/settings/redirect_views.py b/settings/redirect_views.py index 1e9d4f68..672a9400 100644 --- a/settings/redirect_views.py +++ b/settings/redirect_views.py @@ -86,9 +86,11 @@ old_params = {'city': CityRedirect, 'country': CountryRedirect, 'theme': ThemeRe 'page': PageRedirect} def old_redirect(request, *args, **kwargs): + redirect = kwargs.get('redirect_url') params = dict(kwargs) updates = {} + for key, value in params.iteritems(): if key in old_params: redirect_obj = old_params[key]() @@ -97,6 +99,7 @@ def old_redirect(request, *args, **kwargs): params.update(updates) redirect = redirect.format(**params) + return HttpResponsePermanentRedirect(redirect) def old_profile(request):