--- a/web/ldt/ldt_utils/contentindexer.py Tue Sep 28 18:24:14 2010 +0200
+++ b/web/ldt/ldt_utils/contentindexer.py Tue Oct 05 18:19:44 2010 +0200
@@ -4,6 +4,7 @@
import shutil
from ldt.utils import zipfileext
import urllib
+# import ldt.utils.log
import ldt.utils.xml
from django.conf import settings
from models import Content
@@ -19,6 +20,7 @@
import lucene
from ldt.ldt_utils import STORE
from ldt.ldt_utils import ANALYZER
+## import lxml.etree
def Property(func):
return property(**func())
@@ -57,7 +59,7 @@
filepath = urllib.urlopen(url)
doc = xml.dom.minidom.parse(filepath)
doc = Ft.Xml.Domlette.ConvertDocument(doc)
-
+
self.__writer.deleteDocuments(lucene.Term("iri_id", content.iri_id))
con = xml.xpath.Context.Context(doc, 1, 1, None)
@@ -68,6 +70,7 @@
for decoupageNode in ensemble.childNodes:
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(None,u"id")
@@ -78,19 +81,20 @@
tags = elementNode.getAttributeNS(None,u"tags")
if tags is not None:
- tags.replace(";", ",")
+ tags.replace(",", ";")
if tags is None or len(tags) == 0:
tags = ""
restagnode = xml.xpath.Evaluate("tag/text()", elementNode)
for tagnode in restagnode:
- tags = tags + " , " + tagnode.data
+ tags = tags + " ; " + tagnode.data
if tags is None or len(tags) == 0:
tags = ""
restagnode = xml.xpath.Evaluate("tags/tag/text()", elementNode)
+
for tagnode in restagnode:
- tags = tags + " , " + tagnode.data
+ tags = tags + " ; " + tagnode.data
title = ""
for txtRes in xml.xpath.Evaluate("title/text()", elementNode):
@@ -159,6 +163,7 @@
def index_project(self, project):
+ # pocketfilms.utils.log.debug("Indexing project : "+str(project.iri_id))
doc = xml.dom.minidom.parseString(project.ldt)
doc = Ft.Xml.Domlette.ConvertDocument(doc)
@@ -169,12 +174,13 @@
for content in res:
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(None,"id") in self.decoupage_blacklist:
- continue
+ continue
decoupId = decoupageNode.getAttributeNS(None,u"id")
res = xml.xpath.Evaluate("elements/element", decoupageNode)
@@ -184,19 +190,19 @@
tags = elementNode.getAttributeNS(None,u"tags")
if tags is not None:
- tags.replace(";", ",")
+ tags.replace(",", ";")
if tags is None or len(tags) == 0:
tags = ""
restagnode = xml.xpath.Evaluate("tag/text()", elementNode)
for tagnode in restagnode:
- tags = tags + " , " + tagnode.data
+ tags = tags + " ; " + tagnode.data
if tags is None or len(tags) == 0:
tags = ""
restagnode = xml.xpath.Evaluate("tags/tag/text()", elementNode)
for tagnode in restagnode:
- tags = tags + " , " + tagnode.data
+ tags = tags + " ; " + tagnode.data
title = ""
for txtRes in xml.xpath.Evaluate("title/text()", elementNode):