Prevents empty digests from being sent.

[osqa.git] / forum / sitemap.py

diff --git a/forum/sitemap.py b/forum/sitemap.py
index 39dcdc1aa15e5e335ffa73bb59eae8ead364a769..27528a0a16dd4fc1b65a4b2503dd108c44fa1bec 100644 (file)
--- a/forum/sitemap.py
+++ b/forum/sitemap.py
@@ -1,14 +1,37 @@
 from django.contrib.sitemaps import Sitemap
 from forum.models import Question
 from django.contrib.sitemaps import Sitemap
 from forum.models import Question

+from django.conf import settings

 
 class QuestionsSitemap(Sitemap):
     changefreq = 'daily'
     priority = 0.5
     def items(self):
 
 class QuestionsSitemap(Sitemap):
     changefreq = 'daily'
     priority = 0.5
     def items(self):

-        return Question.objects.filter(deleted=None)
+        return Question.objects.filter_state(deleted=False)

 
     def lastmod(self, obj):
         return obj.last_activity_at
 
     def location(self, obj):
         return obj.get_absolute_url()
 
     def lastmod(self, obj):
         return obj.last_activity_at
 
     def location(self, obj):
         return obj.get_absolute_url()

+
+    def __get(self, name, obj, default=None):
+        try:
+            attr = getattr(self, name)
+        except AttributeError:
+            return default
+        if callable(attr):
+            return attr(obj)
+        return attr
+
+    def get_urls(self, page=1):
+        urls = []
+        for item in self.paginator.page(page).object_list:
+            loc = "%s%s" % (settings.APP_URL, self.__get('location', item))
+            url_info = {
+                'location':   loc,
+                'lastmod':    self.__get('lastmod', item, None),
+                'changefreq': self.__get('changefreq', item, None),
+                'priority':   self.__get('priority', item, None)
+            }
+            urls.append(url_info)
+        return urls    
\ No newline at end of file