master
asamoukin 16 years ago
parent cc158aa3bb
commit b65e502f55

@ -251,7 +251,7 @@ class calcHeader(_terms):
reLs = reLns.search(text) reLs = reLns.search(text)
if reLs: if reLs:
reL = reLs reL = reLs
paramLine = text[:reLs.end()] paramLine = text[reP.end():reLs.end()]
paramLine = paramLine.replace("\\"," ") paramLine = paramLine.replace("\\"," ")
else: else:
reLn = re.compile("\n") reLn = re.compile("\n")
@ -261,7 +261,6 @@ class calcHeader(_terms):
self.body = text[reL.end():] self.body = text[reL.end():]
else: else:
self.body = "" self.body = ""
paramList = re.split("\s+",paramLine) paramList = re.split("\s+",paramLine)
if paramList: if paramList:
for i in paramList: for i in paramList:
@ -278,7 +277,8 @@ class calcHeader(_terms):
if i in self.listParNotVal: if i in self.listParNotVal:
self.params[i] = "True" self.params[i] = "True"
else: else:
incorrectParams = set([i]) if i.strip():
incorrectParams = set([i])
elif len(par) == 2: elif len(par) == 2:
self.params[par[0]] = par[1] self.params[par[0]] = par[1]
@ -294,7 +294,7 @@ class calcHeader(_terms):
if incorrectParams: if incorrectParams:
self.headerTerm = False self.headerTerm = False
self.headerCorrect = False self.headerCorrect = False
self.errorMessage = _("incorrect header parameters - %s")\ self.errorMessage = _("incorrect header parameters - '%s'")\
% " ".join(list(incorrectParams)) % " ".join(list(incorrectParams))
def _getType(self): def _getType(self):

Loading…
Cancel
Save