Merge pull request #34 from gunvirranu/master

Implemented 'count' parameter in the search method. r=sudheesh

Author: sudheesh001

README.md

@@ -120,7 +120,7 @@ To update the user details within the server, package a `json` object with the f
 
 Public search API for the scraped tweets from Twitter.
 
-Query structure: `search('querycontent','since date','until date', 'from a specific user')`
+Query structure: `search('querycontent','since date','until date', 'from a specific user', '# of tweets')`
 
 eg. l.search('doctor who')
 
@@ -231,6 +231,10 @@ The `from a specific user` parameter makes sure that the results obtained for th
 
 `l.search('doctor who', '2015-01-10', '2015-01-21','0rb1t3r')`
 
+The `# of tweets` parameter is how many tweets will be returned.
+
+`l.search('avengers', None, None, 'Iron_Man', 3)`
+
 ##### Aggregations API
 
 ##### GeoLocation API

loklak.py

@@ -126,23 +126,26 @@ def settings(self):
             only localhost clients are granted.'
             return json.dumps(return_to_user)
 
-    def search(self, query=None, since=None, until=None, from_user=None):
+    def search(self, query=None, since=None, until=None, from_user=None, count=None):
         """Handles the searching"""
         search_application = 'api/search.json'
         url_to_give = self.baseUrl+search_application
         self.query = query
         self.since = since
         self.until = until
         self.from_user = from_user
+        self.count = count
         if query:
             params = {}
             params['query'] = self.query
             if since:
-                params['query'] = params['query']+' since:'+self.since
+                params['query'] = params['query'] + ' since:'+self.since
             if until:
-                params['query'] = params['query']+' until:'+self.until
+                params['query'] = params['query'] + ' until:'+self.until
             if from_user:
-                params['query'] = params['query']+' from:'+self.from_user
+                params['query'] = params['query'] + ' from:'+self.from_user
+            if count:
+                params['count'] = self.count
             return_to_user = requests.get(url_to_give, params=params)
             if return_to_user.status_code == 200:
                 return return_to_user.json()

sample.py

@@ -103,6 +103,9 @@
 search6 = l.search('sudheesh001', '2015-01-10', '2015-01-21','sudheesh001')
 pprint(search6)
 
+search7 = l.search('gunvirranu', None, None, None, 6)
+pprint(search7)
+
 ###loklak Suggestion API
 suggestion1 = l.suggest()
 pprint(suggest1)