|
|
|
@ -117,10 +117,10 @@ class _terms(_error):
|
|
|
|
|
if self.objVar.defined(vals[0]):
|
|
|
|
|
valVars = self.objVar.Get(vals[0])
|
|
|
|
|
#print valVars
|
|
|
|
|
if not valVars:
|
|
|
|
|
self.setError (_("empty var: ")+\
|
|
|
|
|
vals[0])
|
|
|
|
|
return False
|
|
|
|
|
#if not valVars:
|
|
|
|
|
#self.setError (_("empty var: ")+\
|
|
|
|
|
#vals[0])
|
|
|
|
|
#return False
|
|
|
|
|
# Cравниваем номера версий
|
|
|
|
|
if "_ver" in vals[0]:
|
|
|
|
|
verFile, verVar = self._convertVers(vals[1],valVars)
|
|
|
|
@ -1902,6 +1902,13 @@ class profile(_file, _terms):
|
|
|
|
|
resS = self._reVar.search(textProfileTmp)
|
|
|
|
|
return textProfileTmp
|
|
|
|
|
|
|
|
|
|
#def applyFuncProfile(self, textProfile, nameProfile):
|
|
|
|
|
#""" Применяет функции к тексту профиля
|
|
|
|
|
#"""
|
|
|
|
|
|
|
|
|
|
#def profSum(varName,insertRes, varValue):
|
|
|
|
|
#"""Cуммирует и"""
|
|
|
|
|
|
|
|
|
|
def applyTermsProfile(self, textProfile, nameProfile):
|
|
|
|
|
""" Применяет условия, к условным блокам текста
|
|
|
|
|
"""
|
|
|
|
|