From 3855a7c00ca5916d43e9712c920c52afd9b3a04a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Wed, 26 May 2010 12:20:48 +0400
Subject: [PATCH] Bugfix

---
 pym/cl_datavars.py |  6 ++++--
 pym/cl_template.py | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pym/cl_datavars.py b/pym/cl_datavars.py
index dd78802..e491695 100644
--- a/pym/cl_datavars.py
+++ b/pym/cl_datavars.py
@@ -461,10 +461,12 @@ storage of variables templates")%location
                 # получить объект настроенный на ini
                 config = iniParser(name_calculate_ini)
                 # получаем значение переменной из секции
-                value = config.getVar(section, name_var)
+                data = config.getVar(section, name_var, checkExistVar=True)
                 if value is False:
                     return False
-                valueVar = value
+                existsVar, value = data
+                if existsVar:
+                    valueVar = value
         return valueVar.encode("UTF-8")
 
     def flIniFile(self):
diff --git a/pym/cl_template.py b/pym/cl_template.py
index 0e530d2..74745ad 100644
--- a/pym/cl_template.py
+++ b/pym/cl_template.py
@@ -4380,7 +4380,7 @@ class iniParser(_error, templateFormat):
         res = self.setVar(delStrHeader, dictVar)
         return res
 
-    def getVar(self, strHeader, nameVar):
+    def getVar(self, strHeader, nameVar, checkExistVar=False):
         """Получаем значение переменной из ini-файла"""
         textIni = self.openIniFile()
         nameFomat = self.checkIniFile(textIni)
@@ -4412,10 +4412,16 @@ class iniParser(_error, templateFormat):
             res = objIni.docObj.getAreaFieldValues(strHeader, nameVar, xmlBody)
         else:
             res = False
-        if res is False:
-            return ""
+        if checkExistVar:
+            if res is False:
+                return False, ""
+            else:
+                return True, res
         else:
-            return res
+            if res is False:
+                return ""
+            else:
+                return res
 
 
     def getLastNode(self, objIni, xmlBody, strHeader, formatPlasma):