git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@511 c91db197-33c1-4113-bf15-f8a5c547ca64

16 years ago · c4ad8c53ba
parent f2150003b1
commit c4ad8c53ba
1 changed files with 4 additions and 1 deletions
--- a/pym/cl_profile.py
+++ b/pym/cl_profile.py
@ -109,6 +109,7 @@ class _terms(_error):
                        flagLog = True
                        break
                if not flagLog:
+                    self.setError("'%s'"%term + " " + _("incorrect"))
                    self.setError (textError)
                    return False
                else:
@ -152,6 +153,7 @@ class _terms(_error):
                        try:
                            valFile = int(vals[1])
                        except:
+                            self.setError("'%s'"%term + " " + _("incorrect"))
                            self.setError (textError)
                            return False
                        valVar = valVars
@ -173,6 +175,7 @@ class _terms(_error):
                            else:
                                listEqual.append("0")
                        else:
+                            self.setError("'%s'"%term + " " + _("incorrect"))
                            self.setError (textError)
                            return False
        exec("res=(%s)"%("".join(listEqual)))
@ -1874,7 +1877,7 @@ class profile(_file, _terms):
        # Условия
        self._reTermBloc = re.compile("#\?(?P<rTerm>[a-zA-Z0-9\-_]+)\
 (?P<lTerm>[\>\<\=\!\&\|]+\
-[a-zA-Z0-9\>\<\=\!\|\&\-_\.]+)#\
+[a-zA-Z0-9\>\<\=\!\|\&\-_\.]*)#\
 \n*(?P<body>.+?)\n*#(?P=rTerm)#(?P<end>[ ,\t]*\n?)",re.M|re.S)
        # Объект с переменными
        self.objVar = objVar