--- a/src/js/serializers/PlatformSerializer.js	Fri Apr 13 18:08:19 2012 +0200
+++ b/src/js/serializers/PlatformSerializer.js	Mon Apr 16 19:10:32 2012 +0200
@@ -7,17 +7,17 @@
         media : {
             serialized_name : "medias",
             model_name : "media",
-            deserializer : function(_data, _container) {
-                var _res = new IriSP.Model.Media(_data.id, _container);
+            deserializer : function(_data, _source) {
+                var _res = new IriSP.Model.Media(_data.id, _source);
                 _res.url = _data.href;
                 _res.title = _data.meta["dc:title"];
                 _res.description = _data.meta["dc:description"];
                 _res.setDuration(_data.meta["dc:duration"]);
                 return _res;        
             },
-            serializer : function(_data, _container) {
+            serializer : function(_data, _source) {
                 return {
-                    id : _container.unNamespace(_data.id),
+                    id : _source.unNamespace(_data.id),
                     href : _data.url,
                     meta : {
                         "dc:title" : _data.title,
@@ -30,31 +30,31 @@
         tag : {
             serialized_name : "tags",
             model_name : "tag",
-            deserializer : function(_data, _container) {
-                var _res = new IriSP.Model.Tag(_data.id, _container);
+            deserializer : function(_data, _source) {
+                var _res = new IriSP.Model.Tag(_data.id, _source);
                 _res.title = _data.meta["dc:title"];
                 return _res;        
             },
-            serializer : function(_data, _container) {
+            serializer : function(_data, _source) {
                 return {
-                    id : _container.unNamespace(_data.id),
+                    id : _source.unNamespace(_data.id),
                     meta : {
                         "dc:title" : _data.title
                     }
                 }
             }
         },
-        annotationTypes : {
+        annotationType : {
             serialized_name : "annotation-types",
-            deserializer : function(_data, _container) {
-                var _res = new IriSP.Model.AnnotationType(_data.id, _container);
+            deserializer : function(_data, _source) {
+                var _res = new IriSP.Model.AnnotationType(_data.id, _source);
                 _res.title = _data["dc:title"];
                 _res.description = _data["dc:description"];
                 return _res;        
             },
-            serializer : function(_data, _container) {
+            serializer : function(_data, _source) {
                 return {
-                    id : _container.unNamespace(_data.id),
+                    id : _source.unNamespace(_data.id),
                     "dc:title" : _data.title,
                     "dc:description" : _data.description
                 }
@@ -62,8 +62,8 @@
         },
         annotation : {
             serialized_name : "annotations",
-            deserializer : function(_data, _container) {
-                var _res = new IriSP.Model.Annotation(_data.id, _container);
+            deserializer : function(_data, _source) {
+                var _res = new IriSP.Model.Annotation(_data.id, _source);
                 _res.title = _data.content.title;
                 _res.description = _data.content.description;
                 _res.created = IriSP.Model.isoToDate(_data.meta["dc:created"]);
@@ -72,58 +72,68 @@
                     _c = '0' + _c;
                 }
                 _res.color = '#' + _c;
-                _res.setMedia(_data.media, _container);
+                _res.setMedia(_data.media, _source);
                 _res.setAnnotationType(_data.meta["id-ref"]);
                 _res.setTags(IriSP._(_data.tags).pluck("id-ref"));
                 _res.setBegin(_data.begin);
                 _res.setEnd(_data.end);
+                _res.creator = _data.meta["dc:creator"];
                 return _res;
             },
-            serializer : function(_data, _container) {
+            serializer : function(_data, _source) {
                 return {
-                    id : _container.unNamespace(_data.id),
+                    id : _source.unNamespace(_data.id),
                     content : {
                         title : _data.title,
                         description : _data.description
                     },
-                    media : _container.unNamespace(_data.media.contents),
+                    media : _source.unNamespace(_data.media.contents),
                     meta : {
-                        "id-ref" : _container.unNamespace(_data.annotationType.contents),
-                        "dc:created" : IriSP.Model.dateToIso(_data.created)
+                        "id-ref" : _source.unNamespace(_data.annotationType.contents),
+                        "dc:created" : IriSP.Model.dateToIso(_data.created),
+                        "dc:creator" : _data.creator
                     },
                     tags : _data.getTags().map(function(_el, _id) {
                        return {
-                           "id-ref" : _container.unNamespace(_id)
+                           "id-ref" : _source.unNamespace(_id)
                        } 
                     })
                 }
             }
         }
     },
-    serialize : function(_container) {
+    serialize : function(_source) {
         var _res = {},
             _this = this;
-        _container.each(function(_list, _typename) {
-            _res[_this.types[_typename].serialized_name] = _list.map(function(_el) {
-                return _this.types[_typename].serializer(_el, _container);
-            });
+        _source.each(function(_list, _typename) {
+            if (typeof _this.types[_typename] !== "undefined") {
+                _res[_this.types[_typename].serialized_name] = _list.map(function(_el) {
+                    return _this.types[_typename].serializer(_el, _source);
+                });
+            }
         });
         return _res;
     },
-    deSerialize : function(_data, _container) {
+    deSerialize : function(_data, _source) {
         IriSP._(this.types).each(function(_type, _typename) {
-            if (typeof _data[_type.serialized_name] !== "undefined") {
-                var _list = new IriSP.Model.List(_container.directory);
-                IriSP._(_data[_type.serialized_name]).each(function(_el) {
-                    _list.addElement(_type.deserializer(_el, _container));
-                });
-                _container.addList(_typename, _list);
+            var _listdata = _data[_type.serialized_name];
+            if (typeof _listdata !== "undefined") {
+                var _list = new IriSP.Model.List(_source.directory);
+                if (_listdata.hasOwnProperty("length")) {
+                    var _l = _listdata.length;
+                    for (var _i = 0; _i < _l; _i++) {
+                        _list.addElement(_type.deserializer(_listdata[_i], _source));
+                    }
+                } else {
+                    _list.addElement(_type.deserializer(_listdata, _source));
+                }
+                _source.addList(_typename, _list);
             }
         });
         
         if (typeof _data.meta !== "undefined" && typeof _data.meta.main_media !== "undefined" && typeof _data.meta.main_media["id-ref"] !== "undefined") {
-            _container.setCurrentMediaId(_data.meta.main_media["id-ref"]);
+            _source.setCurrentMediaId(_data.meta.main_media["id-ref"]);
         }
-        _container.setDefaultCurrentMedia();
+        _source.setDefaultCurrentMedia();
     }
 }
\ No newline at end of file