# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1336062604 -7200
# Node ID 1f4fd6aed2d011bbf3b21a993955bc2605cb9746
# Parent  f5c55582565db327cce09e9debc669ac9c27f9f6
correct initialization.

diff -r f5c55582565d -r 1f4fd6aed2d0 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Thu May 03 17:07:41 2012 +0200
+++ b/src/ldt/ldt/__init__.py	Thu May 03 18:30:04 2012 +0200
@@ -15,5 +15,3 @@
 
 __version__ = get_version()
 
-#initialize 
-from ldt.ldt_utils import contentindexer
diff -r f5c55582565d -r 1f4fd6aed2d0 src/ldt/ldt/ldt_utils/__init__.py
--- a/src/ldt/ldt/ldt_utils/__init__.py	Thu May 03 17:07:41 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/__init__.py	Thu May 03 18:30:04 2012 +0200
@@ -1,2 +1,2 @@
-VERSION = (0, 1)
-VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))  
\ No newline at end of file
+#initialize 
+from ldt.ldt_utils import contentindexer
diff -r f5c55582565d -r 1f4fd6aed2d0 src/ldt/ldt/ldt_utils/contentindexer.py
--- a/src/ldt/ldt/ldt_utils/contentindexer.py	Thu May 03 17:07:41 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/contentindexer.py	Thu May 03 18:30:04 2012 +0200
@@ -130,70 +130,70 @@
 
 class ContentIndexer(LdtIndexer):
         
-        def __init__(self, contentList, writer, decoupage_blackList=settings.DECOUPAGE_BLACKLIST, callback=None):
-            super(ContentIndexer, self).__init__(writer, decoupage_blackList)
-            self.__contentList = contentList
-            self.__callback = callback
-                                       
-        def index_all(self):
-            for i,content in enumerate(self.__contentList):
-                if self.__callback:
-                    self.__callback(i,content)
-                self.index_content(content)
-                
-        def index_content(self, content):
+    def __init__(self, contentList, writer, decoupage_blackList=settings.DECOUPAGE_BLACKLIST, callback=None):
+        super(ContentIndexer, self).__init__(writer, decoupage_blackList)
+        self.__contentList = contentList
+        self.__callback = callback
+                                   
+    def index_all(self):
+        for i,content in enumerate(self.__contentList):
+            if self.__callback:
+                self.__callback(i,content)
+            self.index_content(content)
             
-            url = content.iri_url()
-            filepath = urllib.urlopen(url)
-            doc = lxml.etree.parse(filepath) #@UndefinedVariable
-           
-            self.writer.deleteDocuments(lucene.Term("iri_id", content.iri_id))
-            Segment.objects.filter(iri_id=content.iri_id).delete() #@UndefinedVariable
-            
-            res = doc.xpath("/iri/body/ensembles/ensemble")
+    def index_content(self, content):
+        
+        url = content.iri_url()
+        filepath = urllib.urlopen(url)
+        doc = lxml.etree.parse(filepath) #@UndefinedVariable
+       
+        self.writer.deleteDocuments(lucene.Term("iri_id", content.iri_id))
+        Segment.objects.filter(iri_id=content.iri_id).delete() #@UndefinedVariable
+        
+        res = doc.xpath("/iri/body/ensembles/ensemble")
 
-            for ensemble in res:                
-                self.index_ensemble(ensemble, content)
-            
-            self.writer.commit()
+        for ensemble in res:                
+            self.index_ensemble(ensemble, content)
+        
+        self.writer.commit()
             
             
 class ProjectIndexer(LdtIndexer):
-        
-        def __init__(self, projectList, writer, decoupage_blackList=settings.DECOUPAGE_BLACKLIST, callback=None):
-            super(ProjectIndexer, self).__init__(writer, decoupage_blackList)                
-            self.__projectList = projectList
-            self.__callback = callback
-                                   
-        def index_all(self):
-            for i,project in enumerate(self.__projectList):
-                if self.__callback:
-                    self.__callback(i,project)
 
-                self.index_project(project)
- 
-        def index_project(self, project):
-            
-            # pocketfilms.utils.log.debug("Indexing project : "+str(project.iri_id))
-            doc = lxml.etree.fromstring(project.ldt_encoded) #@UndefinedVariable
+    def __init__(self, projectList, writer, decoupage_blackList=settings.DECOUPAGE_BLACKLIST, callback=None):
+        super(ProjectIndexer, self).__init__(writer, decoupage_blackList)                
+        self.__projectList = projectList
+        self.__callback = callback
+                              
+    def index_all(self):
+        for i,project in enumerate(self.__projectList):
+            if self.__callback:
+                self.__callback(i,project)
+
+            self.index_project(project)
+
+    def index_project(self, project):
+
+        # pocketfilms.utils.log.debug("Indexing project : "+str(project.iri_id))
+        doc = lxml.etree.fromstring(project.ldt_encoded) #@UndefinedVariable
 
-            self.writer.deleteDocuments(lucene.Term("project_id", project.ldt_id))
-            Segment.objects.filter(project_obj__ldt_id=project.ldt_id).delete() #@UndefinedVariable
-            
-            res = doc.xpath("/iri/annotations/content")
+        self.writer.deleteDocuments(lucene.Term("project_id", project.ldt_id))
+        Segment.objects.filter(project_obj__ldt_id=project.ldt_id).delete() #@UndefinedVariable
+       
+        res = doc.xpath("/iri/annotations/content")
+
+        for content in res:
+            contentId = content.get(u"id", None)
+            content_obj = None
 
-            for content in res:
-                contentId = content.get(u"id", None)
-                content_obj = None
-                
-                clist = Content.objects.filter(iri_id = contentId) #@UndefinedVariable
-                if len(clist) > 0:
-                    content_obj = clist[0]
- 
-                for ensemble in content.getchildren():
-                    self.index_ensemble(ensemble, content_obj, project)
-            
-            self.writer.commit()
+            clist = Content.objects.filter(iri_id = contentId) #@UndefinedVariable
+            if len(clist) > 0:
+                content_obj = clist[0]
+
+            for ensemble in content.getchildren():
+                self.index_ensemble(ensemble, content_obj, project)
+       
+        self.writer.commit()
 
 @receiver(post_save, sender=Project)
 def index_project(sender, **kwargs):