RSS feed and minor improvements.

[ipfire.org.git] / www / webapp / backend / news.py

diff --git a/www/webapp/backend/news.py b/www/webapp/backend/news.py
index f0c3f8c85fc8eb287c19fa5e56600a1190cc6d2b..75b3d934e93ad57abfc0cadc2b6ae93e58e59f38 100644 (file)
--- a/www/webapp/backend/news.py
+++ b/www/webapp/backend/news.py
@@ -21,11 +21,6 @@ class News(object):
                return self.db.get("SELECT * FROM news WHERE slug=%s", slug)
 
        def get_latest(self, author=None, locale=None, limit=1, offset=0):
-               # XXX find a better way to do offset
-
-               if offset:
-                       limit += offset
-
                query = "SELECT * FROM news WHERE published='Y'"
 
                if author:
@@ -37,14 +32,13 @@ class News(object):
                query += " ORDER BY date DESC"
 
                if limit:
-                       query += " LIMIT %d" % limit
+                       if offset:
+                               query += " LIMIT %d,%d" % (offset, limit)
+                       else:
+                               query += " LIMIT %d" % limit
 
                news = self.db.query(query)
 
-               # XXX can the database do this?
-               if offset:
-                       news = news[offset:]
-
                return news
 
 if __name__ == "__main__":