← Back to branch summary

~didrocks/unity/altf10

« back to all changes in this revision

Viewing changes to grackle/client.py

  • Committer: Aaron Bentley
  • Date: 2012-01-11 13:31:08 UTC
  • Revision ID: aaron@canonical.com-20120111133108-9ijvfo7quc49wmm8
Retrieve messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grackle/client.py
18
18
    def archive_url(self, archive_name, query):
19
19
        path = '/%s' % quote(archive_name)
20
20
        query = urlencode(query)
21
 
        url = urlunparse(('http', self.netloc, path, '', '', ''))
 
21
        return urlunparse(('http', self.netloc, path, '', query, ''))
22
22
 
23
23
    def _get_connection(self):
24
24
        print 'Connecting to %s' % self.port
26
26
 
27
27
    def _verb_archive(self, verb, archive_name, query, body=None):
28
28
        url = self.archive_url(archive_name, query)
 
29
        print "URL: %s" % url
29
30
        connection = self._get_connection()
30
31
        connection.request(verb, url, body)
31
32
        return connection.getresponse()
44
45
    def get_messages(self, archive_name, message_ids=None):
45
46
        parameters = {}
46
47
        if message_ids is not None:
47
 
            parameters[message_ids] = message_ids
 
48
            parameters['message_ids'] = message_ids
48
49
        query = {'parameters': simplejson.dumps(parameters)}
49
50
        response = self._verb_archive('GET', archive_name, query)
50
 
        return {}
 
51
        data = response.read()
 
52
        return simplejson.loads(data)