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