Изменен метод замены для профиля типа plazma, в случае отсутсвия элемента - элемент добавляется

git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@1896 c91db197-33c1-4113-bf15-f8a5c547ca64
master
asamoukin 15 years ago
parent c678f200b1
commit d490921bd5

@ -5191,7 +5191,7 @@ class xmlDocPlasma:
# Добавляем область # Добавляем область
if nodesNewArea: if nodesNewArea:
newAreaAction = self.getActionArea(xmlNewArea) newAreaAction = self.getActionArea(xmlNewArea)
if not (newAreaAction == "drop" or newAreaAction == "replace"): if not (newAreaAction == "drop"):
appendArea(baseNode, xmlNewArea) appendArea(baseNode, xmlNewArea)
return True return True
if not nodesNames or not nodesNewArea: if not nodesNames or not nodesNewArea:
@ -5257,8 +5257,7 @@ class xmlDocPlasma:
if not flagFindArea: if not flagFindArea:
# Добавляем область # Добавляем область
if not (newAreaAction == "drop" or\ if not (newAreaAction == "drop"):
newAreaAction == "replace"):
appendArea(baseNode, xmlNewArea) appendArea(baseNode, xmlNewArea)
else: else:
tmpXmlNewAreas = xpath.Evaluate('child::area',xmlNewArea) tmpXmlNewAreas = xpath.Evaluate('child::area',xmlNewArea)

Loading…
Cancel
Save