summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2008-11-18 12:32:31 +0000
committerMagnus Hagander2008-11-18 12:32:31 +0000
commit6c5418e074b80ac5211f26aa3efb0e63ae61838a (patch)
treee1d77615485437dc5d35ed94e87860fb87cb5053
parentd4a43a8c85f2247982fa1ea1748995793bb29a52 (diff)
Now that we have the admin schema up, only show feeds that are approved, and only show
posts that are not hidden. git-svn-id: file:///Users/dpage/pgweb/svn-repo/trunk@2295 8f5c7a92-453e-0410-a47f-ad33c8a6b003
-rwxr-xr-xplanet/generator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/planet/generator.py b/planet/generator.py
index 0e46d3c2..ee61051d 100755
--- a/planet/generator.py
+++ b/planet/generator.py
@@ -59,7 +59,7 @@ class Generator:
self.db.set_client_encoding('UTF8')
c = self.db.cursor()
c.execute("SET TIMEZONE=GMT")
- c.execute("SELECT guid,link,dat,title,txt,name,blogurl,guidisperma FROM planet.posts INNER JOIN planet.feeds ON planet.feeds.id=planet.posts.feed ORDER BY dat DESC LIMIT 30")
+ c.execute("SELECT guid,link,dat,title,txt,name,blogurl,guidisperma FROM planet.posts INNER JOIN planet.feeds ON planet.feeds.id=planet.posts.feed WHERE planet.feeds.approved AND NOT planet.posts.hidden ORDER BY dat DESC LIMIT 30")
for post in c.fetchall():
desc = self.TruncateAndCleanDescription(post[4])
rss.items.append(PyRSS2Gen.RSSItem(