--- a/alcatel/controller/DocumentaryFiles.py	Mon Jul 22 14:56:35 2013 +0200
+++ b/alcatel/controller/DocumentaryFiles.py	Wed Aug 14 16:36:41 2013 +0200
@@ -6,11 +6,11 @@
 import logging
 import simplejson
 
-from dataparser.DocumentaryFilesGetAttributes import DocumentaryFilesGetAttributes
 from document.models import AnnotationDocumentaryFile
 from document.models import Documentaryfile
 from document.models import Image
 from django.contrib.auth.models import User
+from mediapartdb.MediapartReader import MediapartReader
 
 logger = logging.getLogger('document')
 
@@ -20,8 +20,8 @@
         self.request = request
       
     def get_files(self,user,offset,count):
-        print 'get_files'
-        print user
+        logger.info('get_files user='+str(offset))
+
         '''attr = DocumentaryFilesGetAttributes(self.request)'''
         
         '''if not attr.get_user():'''
@@ -44,17 +44,33 @@
         json['count'] = int(attr.get_count())'''
         json['offset'] = int(offset)
         json['count'] = int(count)
+        json['user'] = user
         total_count = 0
+        nb_articles = 0
         json['documentary_files'] = []
+       
         
         the_user = User.objects.filter(username=user)
-        
+        reader = MediapartReader()
         if the_user:
             documentaryFiles = Documentaryfile.objects.filter(user_id=the_user[0].id)
             for docfile in documentaryFiles:
                 total_count += 1
                 if total_count - 1 >= int(offset) and total_count - 1 < int(offset) + int(count):
                     jsonfile = {'id':docfile.id}
+                    jsonfile['articles'] = []
+                    article_index = 0
+                    for thecluster in docfile.cluster_set.all():
+                        nb_articles += thecluster.document.count()
+                        for thedocument in thecluster.document.all():
+                            if article_index < 4:
+                                article_index += 1
+                                jsonarticle = {'id':str(thedocument.documentId)}
+                                jsonarticle['title'] = str(thedocument.title.encode("utf8"))
+                                jsonarticle['url_document'] = reader.get_url(str(thedocument.documentId))
+                                jsonfile['articles'].append(jsonarticle)
+                    jsonfile['nb_articles'] = nb_articles
+                    nb_articles = 0
                     jsonfile['date'] = docfile.date.isoformat()
                     jsonfile['description'] = str(docfile.description)
                     jsonfile['title'] = str(docfile.title)
@@ -69,7 +85,10 @@
                         jsonannotation['text'] = annotation.description
                         jsonfile['annotations'].append(jsonannotation)
                     json['documentary_files'].append(jsonfile)
+                json['nb_articles'] = nb_articles
+                
+                nb_articles = 0    
         json['total_count'] = total_count
         result = simplejson.dumps(json)
-        logger.debug(result)
+        logger.info(result)
         return result  
\ No newline at end of file