--- a/web/ldt/text/views.py	Tue Nov 16 14:15:07 2010 +0100
+++ b/web/ldt/text/views.py	Tue Nov 16 15:35:12 2010 +0100
@@ -100,7 +100,7 @@
 ## Returns an xml-structured annotation
 #@login_required
 def create_annotation(request, content):
-    cont = base64.urlsafe_b64decode(request.POST["content"])
+    cont = base64.urlsafe_b64decode(str(request.POST["content"]))
     doc = lxml.etree.fromstring(cont)
     
     id = unicode(doc.xpath("/iri/text-annotation/id/text()")[0])
@@ -128,10 +128,10 @@
         annotation.save()
         return HttpResponse(lxml.etree.tostring(doc, pretty_print=True), mimetype="text/xml;charset=utf-8")
         #return doc
-    except:
+    except IntegrityError:
     #except Annotation.IntegrityError:
         #print 'This id is already used! Please choose another one!'
-        raise CONFLICT
+        return HttpResponse(status=409)
     
     
     
@@ -211,7 +211,7 @@
     except:
         raise Http404
     
-    cont = base64.urlsafe_b64decode(request.POST["content"])
+    cont = base64.urlsafe_b64decode(str(request.POST["content"]))
     doc = lxml.etree.fromstring(cont)
     
     uri = doc.xpath("/iri/text-annotation/uri/text()")