--- a/script/rest/search_twitter.py	Wed Dec 14 12:46:53 2011 +0100
+++ b/script/rest/search_twitter.py	Thu Dec 15 06:08:08 2011 +0100
@@ -3,6 +3,7 @@
 import anyjson
 import sqlite3
 import twitter
+import re
 from optparse import OptionParser
 
 
@@ -35,7 +36,8 @@
 
     (options, args) = get_option()
 
-    twitter = twitter.Twitter(domain="search.twitter.com")
+    t = twitter.Twitter(domain="search.twitter.com")
+    t.secure = False
     
     conn_str = args[0].strip()
     if not re.match("^\w+://.+", conn_str):
@@ -53,9 +55,11 @@
         
         results = None        
         page = 1
+        print options.query
         
         while page <= int(1500/int(options.rpp)) and  ( results is None  or len(results) > 0):
-            results = twitter.search(q=options.query, rpp=options.rpp, page=page)
+            results = t.search(q=options.query, rpp=options.rpp, page=page, include_entities=True)
+            
             for tweet in results["results"]:
                 print tweet
                 tweet_str = anyjson.serialize(tweet)