# HG changeset patch # User veltr # Date 1352195942 -3600 # Node ID 4dcd83e962acc638f971e1256a2bef818065b5e1 # Parent c45987bbfb4eaea1dc672c93fa8fd03f5e3aa01d Adapted Metadataplayer to REST API changes diff -r c45987bbfb4e -r 4dcd83e962ac src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Mon Nov 05 19:15:12 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Tue Nov 06 10:59:02 2012 +0100 @@ -87,7 +87,6 @@ },{% if annotation_block %}{ type: "CreateAnnotation", api_endpoint_template: "{{WEB_URL}}{% url api_dispatch_list resource_name='annotations' api_name='1.0' %}", - api_method: "PUT", after_send_timeout: 8000, show_mic_record: {% if show_mic_record %}true{% else %}false{% endif %}, close_after_send: false, diff -r c45987bbfb4e -r 4dcd83e962ac src/ldt/ldt/static/ldt/metadataplayer/CreateAnnotation.js --- a/src/ldt/ldt/static/ldt/metadataplayer/CreateAnnotation.js Mon Nov 05 19:15:12 2012 +0100 +++ b/src/ldt/ldt/static/ldt/metadataplayer/CreateAnnotation.js Tue Nov 06 10:59:02 2012 +0100 @@ -43,7 +43,7 @@ annotation_type: "Contributions", api_serializer: "ldt_annotate", api_endpoint_template: "", - api_method: "PUT", + api_method: "POST", after_send_timeout: 0, close_after_send: false, } diff -r c45987bbfb4e -r 4dcd83e962ac src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js --- a/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js Mon Nov 05 19:15:12 2012 +0100 +++ b/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js Tue Nov 06 10:59:02 2012 +0100 @@ -1734,14 +1734,42 @@ } } }, + deserializeAnnotation : function(_anndata, _source) { + var _ann = new IriSP.Model.Annotation(_anndata.id, _source); + _ann.description = _anndata.content.description || ""; + _ann.title = _anndata.content.title || ""; + _ann.creator = _anndata.meta.creator || ""; + _ann.created = new Date(_anndata.meta.created); + _ann.setMedia(_anndata.media, _source); + var _anntype = _source.getElement(_anndata.type); + if (!_anntype) { + _anntype = new IriSP.Model.AnnotationType(_anndata.type, _source); + _anntype.title = _anndata.type_title; + _source.getAnnotationTypes().push(_anntype); + } + _ann.setAnnotationType(_anntype.id); + var _tagIds = IriSP._(_anndata.tags).map(function(_title) { + var _tags = _source.getTags(true).searchByTitle(_title, true); + if (_tags.length) { + var _tag = _tags[0]; + } + else { + _tag = new IriSP.Model.Tag(_title.replace(/\W/g,'_'),_source); + _tag.title = _title; + _source.getTags().push(_tag); + } + return _tag.id; + }); + _ann.setTags(_tagIds); + _ann.setBegin(_anndata.begin); + _ann.setEnd(_anndata.end); + if (typeof _anndata.content.audio !== "undefined" && _anndata.content.audio.href) { + _ann.audio = _anndata.content.audio; + } + _source.getAnnotations().push(_ann); + }, serialize : function(_source) { - var _this = this - _res = { - "objects": _source.getAnnotations().map(function(_annotation) { - return _this.serializeAnnotation(_annotation, _source); - }) - }; - return JSON.stringify(_res); + return JSON.stringify(this.serializeAnnotation(_source.getAnnotations()[0], _source)); }, deSerialize : function(_data, _source) { if (typeof _data == "string") { @@ -1751,39 +1779,6 @@ _source.addList('tag', new IriSP.Model.List(_source.directory)); _source.addList('annotationType', new IriSP.Model.List(_source.directory)); _source.addList('annotation', new IriSP.Model.List(_source.directory)); - IriSP._(_data.objects).each(function(_anndata) { - var _ann = new IriSP.Model.Annotation(_anndata.id, _source); - _ann.description = _anndata.content.description || ""; - _ann.title = _anndata.content.title || ""; - _ann.creator = _anndata.meta.creator || ""; - _ann.created = new Date(_anndata.meta.created); - _ann.setMedia(_anndata.media, _source); - var _anntype = _source.getElement(_anndata.type); - if (!_anntype) { - _anntype = new IriSP.Model.AnnotationType(_anndata.type, _source); - _anntype.title = _anndata.type_title; - _source.getAnnotationTypes().push(_anntype); - } - _ann.setAnnotationType(_anntype.id); - var _tagIds = IriSP._(_anndata.tags).map(function(_title) { - var _tags = _source.getTags(true).searchByTitle(_title, true); - if (_tags.length) { - var _tag = _tags[0]; - } - else { - _tag = new IriSP.Model.Tag(_title.replace(/\W/g,'_'),_source); - _tag.title = _title; - _source.getTags().push(_tag); - } - return _tag.id; - }); - _ann.setTags(_tagIds); - _ann.setBegin(_anndata.begin); - _ann.setEnd(_anndata.end); - if (typeof _anndata.content.audio !== "undefined" && _anndata.content.audio.href) { - _ann.audio = _anndata.content.audio; - } - _source.getAnnotations().push(_ann); - }); + this.deserializeAnnotation(_data, _source); } } \ No newline at end of file