OSQA-561, adding a separate view for the sitemap pages and creating a section index...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@961 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/sitemap.py b/forum/sitemap.py
index edb322090ce51427c52cd50ddca5beea877f85b4..e225d0066b37409ed921e5fa68873696cb6e2832 100644 (file)
--- a/forum/sitemap.py
+++ b/forum/sitemap.py
@@ -14,15 +14,31 @@ def index(request, sitemaps):
             pages = site().paginator.num_pages
         else:
             pages = site.paginator.num_pages
-        sitemap_url = urlresolvers.reverse('forum.sitemap.sitemap', kwargs={'section': section})
+        sitemap_url = urlresolvers.reverse('sitemap_section_index', kwargs={'section': section})
         sites.append('%s%s' % (settings.APP_URL, sitemap_url))
-        if pages > 1:
-            for page in range(2, pages+1):
-                sites.append('%s%s?p=%s' % (settings.APP_URL, sitemap_url, page))
+
     xml = loader.render_to_string('sitemap_index.xml', {'sitemaps': sites})
     return HttpResponse(xml, mimetype='application/xml')
 
-def sitemap(request, sitemaps, section=None):
+def sitemap_section_index(request, section, sitemaps):
+    try:
+        sitemap = sitemaps[section]()
+    except KeyError:
+        raise Http404("Sitemap doesn't exist")
+
+    paginator = sitemap.paginator
+
+    locations = []
+
+    for page in paginator.page_range:
+        location = urlresolvers.reverse('sitemap_section_page', kwargs={ 'page' : page, 'section' : section })
+        location = '%s%s' % (settings.APP_URL, location)
+        locations.append(location)
+
+    xml = loader.render_to_string('sitemap_section_index.xml', { 'locations' : locations, })
+    return HttpResponse(xml, mimetype='application/xml')
+
+def sitemap(request, sitemaps, section=None, page=1):
     maps, urls = [], []
     if section is not None:
         if section not in sitemaps:
@@ -30,7 +46,6 @@ def sitemap(request, sitemaps, section=None):
         maps.append(sitemaps[section])
     else:
         maps = sitemaps.values()
-    page = request.GET.get("p", 1)
     
     for site in maps:
         try:
@@ -46,10 +61,11 @@ def sitemap(request, sitemaps, section=None):
     return HttpResponse(xml, mimetype='application/xml')
 
 class OsqaSitemap(Sitemap):
+    limit = 250
     changefreq = 'daily'
     priority = 0.5
     def items(self):
-        return Question.objects.filter_state(deleted=False)
+        return Question.objects.filter_state(deleted=False).order_by('id')
 
     def lastmod(self, obj):
         return obj.last_activity_at
@@ -77,4 +93,4 @@ class OsqaSitemap(Sitemap):
                 'priority':   self.__get('priority', item, None)
             }
             urls.append(url_info)
-        return urls    
\ No newline at end of file
+        return urls

diff --git a/forum/skins/default/templates/sitemap_section_index.xml b/forum/skins/default/templates/sitemap_section_index.xml
new file mode 100644 (file)
index 0000000..7033375
--- /dev/null
+++ b/forum/skins/default/templates/sitemap_section_index.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+{% for location in locations %}
+    <sitemap><loc>{{ location }}</loc></sitemap>
+{% endfor %}
+</sitemapindex>

diff --git a/forum/urls.py b/forum/urls.py
index 3e9d19b57b3c4785ff3ed25fb9cb85ceb4fee16b..d1e87bf76014974a140e843e46e88a8a4187c6f4 100644 (file)
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -27,8 +27,9 @@ core_urls = (
     url(r'^$', app.readers.index, name='index'), admin_url,
                         
     url(r'^sitemap.xml$', 'forum.sitemap.index', {'sitemaps': sitemaps}),
-    url(r'^sitemap-(?P<section>.+)\.xml$', 'forum.sitemap.sitemap', {'sitemaps': sitemaps}),
-    
+    url(r'^sitemap-(?P<section>.+)-(?P<page>\d+)\.xml$', 'forum.sitemap.sitemap', {'sitemaps': sitemaps}, name="sitemap_section_page"),
+    url(r'^sitemap-(?P<section>.+)\.xml$', 'forum.sitemap.sitemap_section_index', {'sitemaps': sitemaps}, name="sitemap_section_index"),
+
     url(r'^favicon\.ico$', app.meta.favicon),
     url(r'^cstyle\.css$', app.meta.custom_css, name='custom_css'),