From 374859650c8011a0b4ad96d9343cf1935d369e43 Mon Sep 17 00:00:00 2001 From: Julien Lengrand-Lambert Date: Mon, 4 Feb 2013 16:34:45 +0100 Subject: [PATCH] Now only counts active hashtags in webpage. Also removes connection to tweeter streaming API during client development --- twiderboard/flask_app.py | 2 +- twiderboard/streamer.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/twiderboard/flask_app.py b/twiderboard/flask_app.py index e31b9de..52957a0 100644 --- a/twiderboard/flask_app.py +++ b/twiderboard/flask_app.py @@ -26,7 +26,7 @@ def connect(): def nb_trendy(): session, engine = connect() - query = session.query(func.count(TrendyHashtag.id)) + query = session.query(func.count(TrendyHashtag.id)).filter(TrendyHashtag.active == True) val = query.first()[0] session.close() diff --git a/twiderboard/streamer.py b/twiderboard/streamer.py index 769b6c3..1ae255a 100644 --- a/twiderboard/streamer.py +++ b/twiderboard/streamer.py @@ -225,11 +225,11 @@ class HashtagLogger(): session, engine = self.connect() if len(self.trendy) > 0: - listener = StreamSaverListener(self.trendy, session, engine) + #listener = StreamSaverListener(self.trendy, session, engine) - self.stream = Stream(self.auth.get_auth(), listener) + #self.stream = Stream(self.auth.get_auth(), listener) print self.trendy - self.stream.filter(track=self.trendy, async=True) + #self.stream.filter(track=self.trendy, async=True) else: print "No hashtag to track!"