trans is back, unsafe is in, and errors are better

git-svn-id: http://freebase-python.googlecode.com/svn/trunk@148 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2

1 files changed, 16 insertions, 1 deletions

diff --git a/freebase/api/session.py b/freebase/api/session.py
index a3bae43..bc7a273 100644
--- a/freebase/api/session.py
+++ b/freebase/api/session.py
@@ -379,7 +379,7 @@ class HTTPMetawebSession(MetawebSession):
         if r.code != '/api/status/ok':
             for msg in r.messages:
                 self.log.error('mql error: %s %s %r' % (msg.code, msg.message, msg.get('query', None)))
-            raise MetawebError, 'query failed: %s\n%r' % (r.messages[0].code, r.messages[0].get('query', None))
+            raise MetawebError, 'query failed: %s\n%s\n%s' % (r.messages[0].code, r.messages[0].message, json.dumps(r.messages[0].get('query', None), indent=2))
     
     def _mqlresult(self, r):
         self._check_mqlerror(r)
@@ -547,6 +547,9 @@ class HTTPMetawebSession(MetawebSession):
         
         return [self._mqlresult(rs[key]) for key in keys]
     
+    def trans(self, guid):
+        return self.raw(guid)
+    
     def raw(self, id):
         """translate blob from id. For a more complete description,
         see http://www.freebase.com/view/en/api_trans_raw"""
@@ -573,6 +576,18 @@ class HTTPMetawebSession(MetawebSession):
         
         return body
     
+    def unsafe(self, id):
+        """ unsafe raw """
+        url = '/api/trans/unsafe' + urlquote(id)
+        
+        self.log.info(url)
+        
+        resp, body = self._httpreq(url, headers={'x-metaweb-request' : 'Python'})
+        
+        self.log.info('unsafe is %d bytes' % len(body))
+        
+        return body
+    
     def image_thumb(self, id, maxwidth=None, maxheight=None, mode="fit", onfail=None):
         """ given the id of an image, this will return a URL of a thumbnail of the image.
         The full details of how the image is cropped and finessed is detailed at