Reintegrate merge cacheimp -> trunk.

[osqa.git] / forum / sitemap.py

diff --git a/forum/sitemap.py b/forum/sitemap.py
index b53cb160728351124d3f9e7af4425396e2b2d9ee..edb322090ce51427c52cd50ddca5beea877f85b4 100644 (file)
--- a/forum/sitemap.py
+++ b/forum/sitemap.py
@@ -1,9 +1,11 @@
 from django.contrib.sitemaps import Sitemap
 from forum.models import Question
 from django.conf import settings
 from django.contrib.sitemaps import Sitemap
 from forum.models import Question
 from django.conf import settings

-from django.http import HttpResponse
+from django.http import HttpResponse, Http404

 from django.template import loader
 from django.core import urlresolvers
 from django.template import loader
 from django.core import urlresolvers

+from django.utils.encoding import smart_str
+from django.core.paginator import EmptyPage, PageNotAnInteger

 
 def index(request, sitemaps):
     sites = []
 
 def index(request, sitemaps):
     sites = []


@@ -12,7 +14,7 @@ def index(request, sitemaps):
             pages = site().paginator.num_pages
         else:
             pages = site.paginator.num_pages
             pages = site().paginator.num_pages
         else:
             pages = site.paginator.num_pages

-        sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.sitemap', kwargs={'section': section})
+        sitemap_url = urlresolvers.reverse('forum.sitemap.sitemap', 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' % (settings.APP_URL, sitemap_url))
         if pages > 1:
             for page in range(2, pages+1):


@@ -20,6 +22,29 @@ def index(request, sitemaps):
     xml = loader.render_to_string('sitemap_index.xml', {'sitemaps': sites})
     return HttpResponse(xml, mimetype='application/xml')
 
     xml = loader.render_to_string('sitemap_index.xml', {'sitemaps': sites})
     return HttpResponse(xml, mimetype='application/xml')
 

+def sitemap(request, sitemaps, section=None):
+    maps, urls = [], []
+    if section is not None:
+        if section not in sitemaps:
+            raise Http404("No sitemap available for section: %r" % section)
+        maps.append(sitemaps[section])
+    else:
+        maps = sitemaps.values()
+    page = request.GET.get("p", 1)
+    
+    for site in maps:
+        try:
+            if callable(site):
+                urls.extend(site().get_urls(page=page))
+            else:
+                urls.extend(site.get_urls(page=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')
+

 class OsqaSitemap(Sitemap):
     changefreq = 'daily'
     priority = 0.5
 class OsqaSitemap(Sitemap):
     changefreq = 'daily'
     priority = 0.5