--- a/app/django/contrib/sitemaps/views.py Tue Oct 14 12:36:55 2008 +0000
+++ b/app/django/contrib/sitemaps/views.py Tue Oct 14 16:00:59 2008 +0000
@@ -3,14 +3,22 @@
from django.contrib.sites.models import Site
from django.core import urlresolvers
from django.utils.encoding import smart_str
+from django.core.paginator import EmptyPage, PageNotAnInteger
def index(request, sitemaps):
current_site = Site.objects.get_current()
sites = []
protocol = request.is_secure() and 'https' or 'http'
- for section in sitemaps.keys():
+ for section, site in sitemaps.items():
+ if callable(site):
+ pages = site().paginator.num_pages
+ else:
+ pages = site.paginator.num_pages
sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.sitemap', kwargs={'section': section})
sites.append('%s://%s%s' % (protocol, current_site.domain, sitemap_url))
+ if pages > 1:
+ for page in range(2, pages+1):
+ sites.append('%s://%s%s?p=%s' % (protocol, current_site.domain, sitemap_url, page))
xml = loader.render_to_string('sitemap_index.xml', {'sitemaps': sites})
return HttpResponse(xml, mimetype='application/xml')
@@ -22,10 +30,16 @@
maps.append(sitemaps[section])
else:
maps = sitemaps.values()
+ page = request.GET.get("p", 1)
for site in maps:
- if callable(site):
- urls.extend(site().get_urls())
- else:
- urls.extend(site.get_urls())
+ try:
+ if callable(site):
+ urls.extend(site().get_urls(page))
+ else:
+ urls.extend(site.get_urls(page))
+ except EmptyPage:
+ raise Http404("Page %s empty" % page)
+ except PageNotAnInteger:
+ raise Http404("No page '%s'" % page)
xml = smart_str(loader.render_to_string('sitemap.xml', {'urlset': urls}))
return HttpResponse(xml, mimetype='application/xml')