# HG changeset patch
# User cavaliet
# Date 1352733411 -3600
# Node ID 3d525c04fc7270c950e7cce4041a885f609e8173
# Parent  fd2d4a7a5de69aa8a0dfe67982020c89b9daba00
Debug and corrections on api.

diff -r fd2d4a7a5de6 -r 3d525c04fc72 src/ldt/ldt/api/ldt/resources/content.py
--- a/src/ldt/ldt/api/ldt/resources/content.py	Mon Nov 12 13:28:31 2012 +0100
+++ b/src/ldt/ldt/api/ldt/resources/content.py	Mon Nov 12 16:16:51 2012 +0100
@@ -9,14 +9,17 @@
     class Meta:
         allowed_methods = ['get']
         resource_name = 'contents'
-        queryset = Content.safe_objects.all()
+        queryset = Content.objects.all()
         excludes = ['media_obj']
+    
+    def get_object_list(self, request):
+        return Content.safe_objects.all()
 
     def override_urls(self):
         # WARNING : in tastypie <= 1.0, override_urls is used instead of prepend_urls. From 1.0.0, prepend_urls will be prefered and override_urls deprecated 
         return [
             url(r"^(?P<resource_name>%s)/recommended/$" % self._meta.resource_name, self.wrap_view('get_recommended'), name="api_contents_recommended"),
-            url(r"^(?P<resource_name>%s)/(?P<iri_id>[\w\d_.-]+)/$" % self._meta.resource_name, self.wrap_view('dispatch_detail'), name="api_contents_dispatch_detail"),            
+            url(r"^(?P<resource_name>%s)/(?P<iri_id>[\w\d_.-]+)/$" % self._meta.resource_name, self.wrap_view('dispatch_detail'), name="api_dispatch_detail"),            
         ]
     def get_resource_uri(self, bundle_or_obj):
         kwargs = {
diff -r fd2d4a7a5de6 -r 3d525c04fc72 src/ldt/ldt/api/ldt/resources/project.py
--- a/src/ldt/ldt/api/ldt/resources/project.py	Mon Nov 12 13:28:31 2012 +0100
+++ b/src/ldt/ldt/api/ldt/resources/project.py	Mon Nov 12 16:16:51 2012 +0100
@@ -17,14 +17,14 @@
         authorization = Authorization() # BE CAREFUL WITH THAT, it's unsecure
         authentication = SessionAuthentication()
         resource_name = 'projects'
-        queryset = Project.safe_objects.all()
+        queryset = Project.objects.all()
         serializer = CinelabSerializer()
         # In the future version :
         # detail_uri_name = 'ldt_id'
     
-#    # WARNING : this project API will only accepts and returns json format, no matter format get parameter.
-#    def determine_format(self, request):
-#        return "application/json"
+    
+    def get_object_list(self, request):
+        return Project.safe_objects.all()
     
     def override_urls(self):
         # WARNING : in tastypie <= 1.0, override_urls is used instead of prepend_urls. From 1.0.0, prepend_urls will be prefered and override_urls deprecated 
diff -r fd2d4a7a5de6 -r 3d525c04fc72 src/ldt/ldt/api/ldt/serializers/cinelabserializer.py
--- a/src/ldt/ldt/api/ldt/serializers/cinelabserializer.py	Mon Nov 12 13:28:31 2012 +0100
+++ b/src/ldt/ldt/api/ldt/serializers/cinelabserializer.py	Mon Nov 12 16:16:51 2012 +0100
@@ -72,7 +72,7 @@
         ldt = lxml.etree.tostring(self.cinelab_to_ldt(cinelab), pretty_print=True)
         
         s = {"description": meta["dc:description"], "ldt_id": ldt_id, "title": meta["dc:title"], 
-             "created_by": meta["dc:creator"], "changed_by": meta["dc:contributor"], "created_by": meta["dc:creator"], "changed_by": meta["dc:contributor"],
+             "created_by": meta["dc:creator"], "changed_by": meta["dc:contributor"], "creation_date": meta["dc:created"], "modification_date": meta["dc:modified"],
              "contents": contents, "owner": owner_uri, "state":state, "ldt":ldt}
         
         #s = '{"description": "", "ldt": "<iri><project/><medias/><annotations/><displays/><edits/></iri>", "000ldt_id": "gen_by_tc","title": "aaa GEN BY TC"}'
@@ -166,9 +166,13 @@
                                             elementNode.set('begin', str(a["begin"]))
                                             elementNode.set('dur', str(a["end"]-a["begin"]))
                                             elementNode.set('author', a["meta"]["dc:creator"])
-                                            elementNode.set('date', a["meta"]["dc:modified"])
+                                            elementNode.set('date', a["meta"]["dc:created"])
                                             elementNode.set('color', a["color"])
-                                            elementNode.set('src', "")
+                                            img_src = ""
+                                            if a["content"].has_key("img"):
+                                                if a["content"]["img"].has_key("src"):
+                                                    img_src = a["content"]["img"]["src"]
+                                            elementNode.set('src', img_src)
                                             titleElm = lxml.etree.SubElement(elementNode, 'title')
                                             titleElm.text = a["content"]["title"]
                                             abstractElm = lxml.etree.SubElement(elementNode, 'abstract')