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/__init__.py

    r8140 r8215  
    1 from django.core import urlresolvers 
     1from django.core import urlresolvers, paginator 
    22import urllib 
    33 
     
    3535 
    3636class Sitemap: 
     37    # This limit is defined by Google. See the index documentation at 
     38    # http://sitemaps.org/protocol.php#index. 
     39    limit = 50000 
     40 
    3741    def __get(self, name, obj, default=None): 
    3842        try: 
     
    5054        return obj.get_absolute_url() 
    5155 
    52     def get_urls(self): 
     56    def _get_paginator(self): 
     57        if not hasattr(self, "paginator"): 
     58            self.paginator = paginator.Paginator(self.items(), self.limit) 
     59        return self.paginator 
     60    paginator = property(_get_paginator) 
     61 
     62    def get_urls(self, page=1): 
    5363        from django.contrib.sites.models import Site 
    5464        current_site = Site.objects.get_current() 
    5565        urls = [] 
    56         for item in self.items()
     66        for item in self.paginator.page(page).object_list
    5767            loc = "http://%s%s" % (current_site.domain, self.__get('location', item)) 
    5868            url_info = {