From c5ceae44b5b1f3d6f20497ebca81042f85fd3178 Mon Sep 17 00:00:00 2001 From: cedricbonhomme Date: Sun, 22 Apr 2012 22:22:06 +0200 Subject: Renamed get_collection() to get_feed(). --- source/pyAggr3g470r.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source/pyAggr3g470r.py') diff --git a/source/pyAggr3g470r.py b/source/pyAggr3g470r.py index 4b363cdb..9d1f98b1 100755 --- a/source/pyAggr3g470r.py +++ b/source/pyAggr3g470r.py @@ -432,7 +432,7 @@ class Root: """ try: feed_id, article_id = param.split(':') - feed = self.mongo.get_collection(feed_id) + feed = self.mongo.get_feed(feed_id) articles = self.mongo.get_articles_from_collection(feed_id) article = self.mongo.get_article(feed_id, article_id) except: @@ -575,7 +575,7 @@ class Root: favourite articles for the current feed. """ try: - feed = self.mongo.get_collection(feed_id) + feed = self.mongo.get_feed(feed_id) articles = self.mongo.get_articles_from_collection(feed_id) except KeyError: return self.error_page("This feed do not exists.") @@ -704,7 +704,7 @@ class Root: This page displays all articles of a feed. """ try: - feed = self.mongo.get_collection(feed_id) + feed = self.mongo.get_feed(feed_id) articles = self.mongo.get_articles_from_collection(feed_id) except KeyError: return self.error_page("This feed do not exists.") @@ -800,7 +800,7 @@ class Root: # List unread articles of a feed else: try: - feed = self.mongo.get_collection(feed_id) + feed = self.mongo.get_feed(feed_id) except: self.error_page("This feed do not exists.") html += """

Unread article(s) of the feed %s

@@ -929,7 +929,7 @@ class Root: """ try: feed_id, article_id = target.split(':') - feed = self.mongo.get_collection(feed_id) + feed = self.mongo.get_feed(feed_id) article = self.mongo.get_article(feed_id, article_id) except: return self.error_page("Bad URL. This article do not exists.") @@ -1111,7 +1111,7 @@ class Root: html += htmlnav html += """
""" - feed = self.mongo.get_collection(feed_id) + feed = self.mongo.get_feed(feed_id) self.mongo.delete_feed(feed_id) utils.remove_feed(feed["feed_link"]) @@ -1237,7 +1237,7 @@ class Root: return self.error_page("Bad URL.") try: feed_id, article_id = param.split(':') - feed = self.mongo.get_collection(feed_id) + feed = self.mongo.get_feed(feed_id) articles = self.mongo.get_articles_from_collection(feed_id) article = self.mongo.get_article(feed_id, article_id) except: -- cgit