From 025c4a7502ddd6aee37eb47b576c88c47eac5073 Mon Sep 17 00:00:00 2001
From: Julien Lengrand-Lambert <julien@lengrand.fr>
Date: Mon, 28 Jan 2013 16:45:55 +0100
Subject: [PATCH] Removes small bug finding duplicates where there is none.

Also removes print statement from data.py
---
 log/bug_tweepy          | 36 ++++++++++++++++++++++++++++++++++++
 twiderboard/data.py     |  1 -
 twiderboard/streamer.py | 15 ++++++++++-----
 3 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 log/bug_tweepy

diff --git a/log/bug_tweepy b/log/bug_tweepy
new file mode 100644
index 0000000..287d2fe
--- /dev/null
+++ b/log/bug_tweepy
@@ -0,0 +1,36 @@
+ found, creating
+ElementException :  Cannot create Member, Tweet is not valid !
+No member found, creating
+No member found, creating
+Error: Duplicate members found.
+Error: Duplicate members found.
+No member found, creating
+Error: Duplicate members found.
+Exception in thread Thread-1:
+Traceback (most recent call last):
+  File "/usr/lib/python2.7/threading.py", line 552, in __bootstrap_inner
+    self.run()
+  File "/usr/lib/python2.7/threading.py", line 505, in run
+    self.__target(*self.__args, **self.__kwargs)
+  File "/home/jll/.virtualenvs/twiderboard/local/lib/python2.7/site-packages/tweepy/streaming.py", line 117, in _run
+    self._read_loop(resp)
+  File "/home/jll/.virtualenvs/twiderboard/local/lib/python2.7/site-packages/tweepy/streaming.py", line 150, in _read_loop
+    c = resp.read(1)
+  File "/usr/lib/python2.7/httplib.py", line 541, in read
+    return self._read_chunked(amt)
+  File "/usr/lib/python2.7/httplib.py", line 574, in _read_chunked
+    line = self.fp.readline(_MAXLINE + 1)
+  File "/usr/lib/python2.7/socket.py", line 476, in readline
+    data = self._sock.recv(self._rbufsize)
+  File "/usr/lib/python2.7/ssl.py", line 241, in recv
+    return self.read(buflen)
+  File "/usr/lib/python2.7/ssl.py", line 160, in read
+    return self._sslobj.read(len)
+SSLError: The read operation timed out
+
+^C
+Stopping Streamer
+
+
+--------------------------------
+
diff --git a/twiderboard/data.py b/twiderboard/data.py
index d320687..deee01c 100644
--- a/twiderboard/data.py
+++ b/twiderboard/data.py
@@ -35,7 +35,6 @@ if oa != 'True':
     oauth = False
 else:
     oauth = True
-print oauth == True
 keys_root = parser.get('keys', 'root')
 oauth_name = parser.get('keys', 'oauth')
 basic_name = parser.get('keys', 'basic')
diff --git a/twiderboard/streamer.py b/twiderboard/streamer.py
index 9cbaece..f75e959 100644
--- a/twiderboard/streamer.py
+++ b/twiderboard/streamer.py
@@ -54,7 +54,7 @@ class StreamSaverListener(StreamListener):
         # here i should update members now.
         self.update_members(tweet)
 
-        self.cpt += 1
+        #self.cpt += 1
 
         if self.cpt >= 1:
             self.session.commit()  # force saving changes
@@ -87,7 +87,7 @@ class StreamSaverListener(StreamListener):
         m_query = self.session.query(Member).filter(Member.author == auth).filter(Member.hashtag == hasht)
 
         reslen = len(m_query.all())
-        if reslen >= 1:
+        if reslen > 1:
             print "Error: Duplicate members found."
         elif reslen == 0:
             print "No member found, creating"
@@ -106,9 +106,12 @@ class StreamSaverListener(StreamListener):
             member = Member(tweet.author, tweet.hashtag, 1)
             self.session.add(member)
 
+            self.cpt += 1
         else:
-            self.logger.error("ElementException :  Cannot create Member, Tweet is not valid !")
-            raise ElementException  # FIXME : Take care
+            #self.logger.error("ElementException :  Cannot create Member, Tweet is not valid !")
+            print "ElementException :  Cannot create Member, Tweet is not valid !"
+            #raise ElementException  # FIXME : Take care
+            pass
 
     def update_member(self, member):
         """
@@ -119,8 +122,10 @@ class StreamSaverListener(StreamListener):
             member.update()
             self.session.add(member)
 
+            self.cpt += 1
         else:
-            self.logger.error("ElementException :  Cannot update Member, Member is not valid !")
+            #self.logger.error("ElementException :  Cannot update Member, Member is not valid !")
+            print "ElementException :  Cannot update Member, Member is not valid !"
             raise ElementException  # FIXME : Take care