add addAnnotations api to batch import many annotations, update importAnnotations dialog

This commit is contained in:
j 2013-03-04 15:41:25 +00:00
commit 29008d0eae
6 changed files with 158 additions and 56 deletions

View file

@ -4,6 +4,7 @@ import json
import ox
from django.conf import settings
from django.db import transaction
from celery.task import task
import models
@ -63,6 +64,33 @@ def update_matches(id, type):
for e in a_matches.all():
e.update_matches(models.Annotation.objects.filter(pk=a.id))
@task(ignore_results=False, queue='default')
def add_annotations(data):
from item.models import Item
from user.models import User
item = Item.objects.get(itemId=data['item'])
layer_id = data['layer']
layer = filter(lambda l: l['id'] == layer_id, settings.CONFIG['layers'])[0]
user = User.objects.get(username=data['user'])
with transaction.commit_on_success():
for a in data['annotations']:
annotation = models.Annotation(
item=item,
layer=layer_id,
user=user,
start=float(a['in']), end=float(a['out']),
value=a['value'])
annotation.save()
#update facets if needed
if filter(lambda f: f['id'] == layer_id, settings.CONFIG['filters']):
item.update_layer_facet(layer_id)
Item.objects.filter(id=item.id).update(modified=annotation.modified)
annotation.item.modified = annotation.modified
annotation.item.update_find()
annotation.item.update_sort()
annotation.item.update_facets()
return True
@task(ignore_results=True, queue='default')
def update_item(id):
from item.models import Item

View file

@ -15,7 +15,7 @@ from item import utils
from item.models import Item
import models
from tasks import update_item
from tasks import update_item, add_annotations
def parse_query(data, user):
query = {}
@ -157,6 +157,45 @@ def addAnnotation(request):
return render_to_json_response(response)
actions.register(addAnnotation, cache=False)
@login_required_json
def addAnnotations(request):
'''
param data {
item: itemId,
layer: layerId,
annotations: [{
in: float,
out: float,
value: string
}, ...]
}
return {'status': {'code': int, 'text': string},
'data': {
id: 123, //id of new annotation
...
}
}
'''
data = json.loads(request.POST['data'])
for key in ('item', 'layer', 'annotations'):
if key not in data:
return render_to_json_response(json_response(status=400,
text='invalid data'))
item = get_object_or_404_json(Item, itemId=data['item'])
layer_id = data['layer']
layer = filter(lambda l: l['id'] == layer_id, settings.CONFIG['layers'])[0]
if item.editable(request.user) \
and layer['canAddAnnotations'].get(request.user.get_profile().get_level()):
response = json_response()
data['user'] = request.user.username
t = add_annotations.delay(data)
response['data']['taskId'] = t.task_id
else:
response = json_response(status=403, text='permission denied')
return render_to_json_response(response)
actions.register(addAnnotations, cache=False)
@login_required_json
def removeAnnotation(request):