|
|
|
@ -2255,6 +2255,7 @@ class profile(_file, _terms):
|
|
|
|
|
#print "#%s#" %(objProfOld.docObj.body.toprettyxml())
|
|
|
|
|
#print "#%s#" %(objProfNew.docObj.body.toprettyxml())
|
|
|
|
|
objProfOld.join(objProfNew)
|
|
|
|
|
print objProfOld.docObj.body.toprettyxml()
|
|
|
|
|
if objHeadNew.execStr:
|
|
|
|
|
self.oldProfile = objHeadNew.execStr + title +\
|
|
|
|
|
objProfOld.getConfig().encode("UTF-8")
|
|
|
|
@ -2301,6 +2302,23 @@ class samba(objShare):
|
|
|
|
|
"""Объединяем конфигурации"""
|
|
|
|
|
if isinstance(sambaObj, samba):
|
|
|
|
|
self.docObj.joinDoc(sambaObj.doc)
|
|
|
|
|
# Для добавления перевода строки между областями если его нет
|
|
|
|
|
xmlAreas = xpath.Evaluate("child::area", self.docObj.body)
|
|
|
|
|
for xmlArea in xmlAreas:
|
|
|
|
|
if xmlArea.previousSibling and\
|
|
|
|
|
self.docObj.getActionField(xmlArea.previousSibling) == "br":
|
|
|
|
|
continue
|
|
|
|
|
xmlFields = xpath.Evaluate("child::field", xmlArea)
|
|
|
|
|
if not (xmlFields and\
|
|
|
|
|
(self.docObj.getTypeField(xmlFields[-1]) == "br" or\
|
|
|
|
|
self.docObj.getTypeField(xmlFields[-1]) == "comment")):
|
|
|
|
|
if xmlArea.nextSibling:
|
|
|
|
|
parentNode = xmlArea.parentNode
|
|
|
|
|
nextNode = xmlArea.nextSibling
|
|
|
|
|
parentNode.insertBefore(self.docObj.createField("br",
|
|
|
|
|
[],"",[],
|
|
|
|
|
False,False),
|
|
|
|
|
nextNode)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def setDataField(self, txtLines, endtxtLines):
|
|
|
|
@ -2397,7 +2415,7 @@ class samba(objShare):
|
|
|
|
|
"""
|
|
|
|
|
outTxt = "[" + strHeader + "]\n"
|
|
|
|
|
for key in dictVar.keys():
|
|
|
|
|
outTxt += "%s=%s\n" %(key,dictVar[key])
|
|
|
|
|
outTxt += "%s = %s\n" %(key,dictVar[key])
|
|
|
|
|
return outTxt
|
|
|
|
|
|
|
|
|
|
def _textToXML(self):
|
|
|
|
|