[FIX] url list for ngrams.

annotations/urls.py

@@ -5,7 +5,7 @@ from annotations import views
 urlpatterns = patterns('',
     url(r'^document/(?P<doc_id>[0-9]+)$', views.Document.as_view()), # document view
     url(r'^corpus/(?P<corpus_id>[0-9]+)/document/(?P<doc_id>[0-9]+)$', views.NgramList.as_view()), # the list associated with an ngram
-    url(r'^lists/(?P<list_id>[0-9]+)/ngrams/(?P<ngram_id>[0-9]+)$', views.NgramEdit.as_view()), #
+    url(r'^lists/(?P<list_id>[0-9]+)/ngrams/(?P<ngram_ids>(([0-9])+(\+[0-9]+)*)$', views.NgramEdit.as_view()), #
     url(r'^lists/(?P<list_id>[0-9]+)/ngrams/create$', views.NgramCreate.as_view()), #
     url(r'^lists/(?P<list_id>[0-9]+)/multiple?$', views.deleteMultiple ), # FIXME What's this ?
 )

annotations/views.py

@@ -72,7 +72,7 @@ class NgramEdit(APIView):
         # TODO remove the node_ngram from another conflicting list
         # FIXME session.query(Node_Ngram).filter(Node_Ngram.ngram_id==ngram_id).delete()
         # add the ngram to the list
-        for ngram_id in ngram_ids:
+        for ngram_id in ngram_ids.split('+'):
             ngram_id = int(ngram_id)
             node_ngram = Node_Ngram(node_id=list_id, ngram_id=ngram_id, weight=1.0)
             session.add(node_ngram)
@@ -89,7 +89,8 @@ class NgramEdit(APIView):
         """
         Delete a ngram from a list
         """
-        for ngram_id in ngram_ids:
+        for ngram_id in ngram_ids.split('+'):
+            ngram_id = int(ngram_id)
             (session.query(Node_Ngram)
                     .filter(Node_Ngram.node_id==list_id)
                     .filter(Node_Ngram.ngram_id==ngram_id).delete()