Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/django/contrib/sitemaps/views.py

    r6018 r8215  
    44from django.core import urlresolvers 
    55from django.utils.encoding import smart_str 
     6from django.core.paginator import EmptyPage, PageNotAnInteger 
    67 
    78def index(request, sitemaps): 
    …… 
    910    sites = [] 
    1011    protocol = request.is_secure() and 'https' or 'http' 
    11     for section in sitemaps.keys(): 
     12    for section, site in sitemaps.items(): 
     13        if callable(site): 
     14            pages = site().paginator.num_pages 
     15        else: 
     16            pages = site.paginator.num_pages 
    1217        sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.sitemap', kwargs={'section': section}) 
    1318        sites.append('%s://%s%s' % (protocol, current_site.domain, sitemap_url)) 
     19        if pages > 1: 
     20            for page in range(2, pages+1): 
     21                sites.append('%s://%s%s?p=%s' % (protocol, current_site.domain, sitemap_url, page)) 
    1422    xml = loader.render_to_string('sitemap_index.xml', {'sitemaps': sites}) 
    1523    return HttpResponse(xml, mimetype='application/xml') 
    …… 
    2331    else: 
    2432        maps = sitemaps.values() 
     33    page = request.GET.get("p", 1) 
    2534    for site in maps: 
    26         if callable(site): 
    27             urls.extend(site().get_urls()) 
    28         else: 
    29             urls.extend(site.get_urls()) 
     35        try: 
     36            if callable(site): 
     37                urls.extend(site().get_urls(page)) 
     38            else: 
     39                urls.extend(site.get_urls(page)) 
     40        except EmptyPage: 
     41            raise Http404("Page %s empty" % page) 
     42        except PageNotAnInteger: 
     43            raise Http404("No page '%s'" % page) 
    3044    xml = smart_str(loader.render_to_string('sitemap.xml', {'urlset': urls})) 
    3145    return HttpResponse(xml, mimetype='application/xml')