--- a/web/hdabo/views.py	Fri Jul 08 01:41:50 2011 +0200
+++ b/web/hdabo/views.py	Fri Jul 08 02:10:01 2011 +0200
@@ -231,7 +231,7 @@
     new_order = int(request.POST["new_order"]) - 1
     old_order = int(request.POST["old_order"]) - 1
     # First we get the datasheet's TaggedSheets (list to force evaluation)
-    ordered_tags = list(TaggedSheet.objects.filter(datasheet=Datasheet.objects.get(hda_id=ds_id)).order_by('order'))
+    ordered_tags = list(TaggedSheet.objects.filter(datasheet__hda_id=ds_id).order_by('order'))
     # We change the moved TaggedSheets's order
     new_ts_order = ordered_tags[new_order].order
     moved_ts = ordered_tags[old_order]
@@ -260,7 +260,7 @@
 @login_required
 def get_tag_table(request=None, ds_id=None, valid=None):
     
-    ordered_tags = TaggedSheet.objects.filter(datasheet=Datasheet.objects.filter(hda_id=ds_id)[0]).order_by('order')
+    ordered_tags = TaggedSheet.objects.filter(datasheet__hda_id=ds_id).order_by('order')
     
     return render_to_response("partial/tag_table.html",
                               {'ordered_tags':ordered_tags, 'valid':valid},
@@ -319,7 +319,7 @@
     ds_id = request.POST["datasheet_id"]
     tag_id = request.POST["tag_id"]
     # First we get the datasheet's TaggedSheets
-    ds_tags = TaggedSheet.objects.filter(datasheet=Datasheet.objects.filter(hda_id=ds_id)[0])
+    ds_tags = TaggedSheet.objects.filter(datasheet__hda_id=ds_id)
     # We get the current TaggedSheet and we delete it
     ts = ds_tags.filter(tag=Tag.objects.filter(id=tag_id))[0]
     ts.delete()
@@ -382,7 +382,7 @@
 
         tag, revision_id, created = get_or_create_tag(tag_label) #@UnusedVariable
 
-        ts = TaggedSheet.objects.get(tag=tag_id, datasheet=ds_id)
+        ts = TaggedSheet.objects.get(tag=tag_id, datasheet__hda_id=ds_id)
         ts.tag = tag
         ts.wikipedia_revision_id = revision_id
         kwargs = {DJANGO_ID + "__exact": unicode(ds_id)}
@@ -457,12 +457,15 @@
     # - ordered tag for one datasheet : POST["datasheet_id"] is not null
     # - all tags list : POST["datasheet_id"] is null and POST["num_page"] and POST["nb_by_page"] are not null
     tag_id = request.POST["tag_id"]
-    tag = Tag.objects.filter(id=tag_id)[0]
+    tag = Tag.objects.get(id=tag_id)
     tag.wikipedia_url = None
     tag.wikipedia_pageid = None
+    tag.dbpedia_uri = None
     tag.url_status = 0;
     tag.save()
     
+    TaggedSheet.objects.filter(tag=tag).update(wikipedia_revision_id=None)
+    
     if u"datasheet_id" in request.POST :
         return get_tag_table(request=request, ds_id=request.POST["datasheet_id"], valid=0)
     else :