# HG changeset patch
# User cavaliet
# Date 1385743318 -3600
# Node ID bf0e3bc6f2025efb0190a7d80a2e8f8fbbd65d7c
# Parent  620f2ee2248d187728466694b51e8615ba41ac05
debug annotation creator in json and V01.51.17

diff -r 620f2ee2248d -r bf0e3bc6f202 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Thu Nov 28 16:44:39 2013 +0100
+++ b/src/ldt/ldt/__init__.py	Fri Nov 29 17:41:58 2013 +0100
@@ -1,6 +1,6 @@
 __all__ = ["VERSION", "get_version", "__version__"]
 
-VERSION = (1, 51, 16, "final", 0)
+VERSION = (1, 51, 17, "final", 0)
 
 
 def get_version():
diff -r 620f2ee2248d -r bf0e3bc6f202 src/ldt/ldt/ldt_utils/projectserializer.py
--- a/src/ldt/ldt/ldt_utils/projectserializer.py	Thu Nov 28 16:44:39 2013 +0100
+++ b/src/ldt/ldt/ldt_utils/projectserializer.py	Fri Nov 29 17:41:58 2013 +0100
@@ -135,8 +135,11 @@
             if not cutting_only and self.from_display and decoupage_id not in self.display_cuttings_list:
                 continue
             decoupage_creator = decoupage_node.attrib[u"author"]
+            if decoupage_creator=="perso":
+                decoupage_creator = self.project.owner.username
             if not decoupage_creator:
                 decoupage_creator = "IRI"
+            
             decoupage_contributor = decoupage_creator
             date_str = decoupage_node.get(u"date")
             decoupage_created = None
@@ -245,6 +248,12 @@
                 if not element_tags:
                     element_tags = None
                 
+                annot_creator = decoupage_node.attrib[u"author"]
+                if annot_creator=="perso":
+                    annot_creator = decoupage_creator
+                if not annot_creator:
+                    annot_creator = decoupage_creator
+                
                 new_annotation = {
                     "begin": int(float(element_begin)),
                     "end": int(float(element_begin)) + int(float(element_duration)),
@@ -269,7 +278,7 @@
                     "tags": element_tags,
                     "meta": {
                         "id-ref": decoupage_id,
-                        "dc:creator": decoupage_creator,
+                        "dc:creator": annot_creator,
                         "dc:contributor": decoupage_contributor,
                         "dc:created": decoupage_created,
                         "dc:modified": decoupage_modified,