web/ldt/ldt_utils/contentindexer.py
changeset 10 84e31387a741
parent 5 ae8593287883
--- a/web/ldt/ldt_utils/contentindexer.py	Thu Jun 10 04:16:26 2010 +0200
+++ b/web/ldt/ldt_utils/contentindexer.py	Thu Jun 10 11:17:09 2010 +0200
@@ -65,18 +65,18 @@
             res = xml.xpath.Evaluate("/iri/body/ensembles/ensemble", context=con)
 
             for ensemble in res:
-                ensembleId = ensemble.getAttributeNS("id",None)
+                ensembleId = ensemble.getAttributeNS(None,u"id")
                 
                 for decoupageNode in ensemble.childNodes:
-                    if decoupageNode.nodeType != xml.dom.Node.ELEMENT_NODE or decoupageNode.tagName != "decoupage"  or decoupageNode.getAttributeNS("id",None) in self.decoupage_blacklist:
+                    if decoupageNode.nodeType != xml.dom.Node.ELEMENT_NODE or decoupageNode.tagName != "decoupage"  or decoupageNode.getAttributeNS(None,u"id") in self.decoupage_blacklist:
                         continue
                     
-                    decoupId = decoupageNode.getAttributeNS("id",None)
+                    decoupId = decoupageNode.getAttributeNS(None,u"id")
                     res = xml.xpath.Evaluate("elements/element", decoupageNode)
                     for elementNode in res:
                         doc = lucene.Document()
-                        elementId = elementNode.getAttributeNS("id",None)
-                        tags = elementNode.getAttributeNS("tags",None)
+                        elementId = elementNode.getAttributeNS(None,u"id")
+                        tags = elementNode.getAttributeNS(None,u"tags")
                         
                         if tags is not None:                            
                             tags.replace(",", ";")
@@ -170,21 +170,21 @@
             res = xml.xpath.Evaluate("/iri/annotations/content", context=con)
 
             for content in res:
-                contentId = content.getAttributeNS("id",None)
+                contentId = content.getAttributeNS(None,u"id")
                 
                 ensembleId = "ens_perso"
                 
                 for decoupageNode in content.childNodes:
                     # pocketfilms.utils.log.debug("Indexing content decoupage : "+ repr(decoupageNode.nodeType) + " in " + repr(self.decoupage_blacklist))
-                    if decoupageNode.nodeType != xml.dom.Node.ELEMENT_NODE or decoupageNode.tagName != "decoupage"  or decoupageNode.getAttributeNS("id",None) in self.decoupage_blacklist:
+                    if decoupageNode.nodeType != xml.dom.Node.ELEMENT_NODE or decoupageNode.tagName != "decoupage"  or decoupageNode.getAttributeNS(None,"id") in self.decoupage_blacklist:
                         continue
                     
-                    decoupId = decoupageNode.getAttributeNS("id",None)
+                    decoupId = decoupageNode.getAttributeNS(None,u"id")
                     res = xml.xpath.Evaluate("elements/element", decoupageNode)
                     for elementNode in res:
                         doc = lucene.Document()
-                        elementId = elementNode.getAttributeNS("id",None)
-                        tags = elementNode.getAttributeNS("tags",None)
+                        elementId = elementNode.getAttributeNS(None,u"id")
+                        tags = elementNode.getAttributeNS(None,u"tags")
                         
                         if tags is not None:                            
                             tags.replace(",", ";")