From 0cc81ca1e38d1d0d03fdfff30ff6abb5229df557 Mon Sep 17 00:00:00 2001 From: asamoukin Date: Thu, 30 Jul 2009 08:31:48 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20XML=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20XML=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@2238 c91db197-33c1-4113-bf15-f8a5c547ca64 --- pym/cl_profile.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pym/cl_profile.py b/pym/cl_profile.py index fe83371..c615863 100644 --- a/pym/cl_profile.py +++ b/pym/cl_profile.py @@ -920,15 +920,10 @@ class xmlDoc: xmlArea.removeChild(nodeFieldOld.previousSibling) xmlArea.removeChild(nodeFieldOld) continue - #if not self.getActionField(nodeFieldOld): - #self.setActionField(nodeFieldOld,"insert") - #else: - #self.setActionField(nodeFieldOld,"append") oldValues = self.getFieldValues(nodeFieldOld) - for newValue in newValues: - if not (newValue in oldValues): - flagCompare = False - break + # Сравнение значений переменной профиля и файла + if set(newValues) != set(oldValues): + flagCompare = False if self.getActionField(xmlNewField) == "drop": return True appSplLst = []