|
|
|
@ -3629,18 +3629,20 @@ class dovecot(bind):
|
|
|
|
|
def __init__(self, text):
|
|
|
|
|
bind.__init__(self,text)
|
|
|
|
|
|
|
|
|
|
def postXML(self):
|
|
|
|
|
def postXML(self, xmlArea=False):
|
|
|
|
|
"""Последующая постобработка XML"""
|
|
|
|
|
# Добавляем перевод строки если его нет в конец области
|
|
|
|
|
xmlFields = xpath.Evaluate("child::field", self.docObj.body)
|
|
|
|
|
# Добавляем перевод строки если его нет в конец области
|
|
|
|
|
if not xmlArea:
|
|
|
|
|
xmlArea = self.docObj.body
|
|
|
|
|
xmlFields = xpath.Evaluate("child::field", xmlArea)
|
|
|
|
|
if xmlFields and not (\
|
|
|
|
|
self.docObj.getTypeField(xmlFields[-1]) == "br" or\
|
|
|
|
|
self.docObj.getTypeField(xmlFields[-1]) == "comment"):
|
|
|
|
|
self.docObj.body.appendChild(self.docObj.createField("br",
|
|
|
|
|
xmlArea.appendChild(self.docObj.createField("br",
|
|
|
|
|
[],"",[],
|
|
|
|
|
False,False))
|
|
|
|
|
self.docObj.bodys = xpath.Evaluate("child::area", self.docObj.body)
|
|
|
|
|
for area in self.docObj.bodys:
|
|
|
|
|
xmlAreas = xpath.Evaluate("child::area", xmlArea)
|
|
|
|
|
for area in xmlAreas:
|
|
|
|
|
self.postXML(area)
|
|
|
|
|
|
|
|
|
|
def join(self, dovecotObj):
|
|
|
|
|