Mercurial > gemma
changeset 5362:f733bb327b9b extented-report
XLSX template: Fixed copy & paste errors from the toy tool.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Tue, 22 Jun 2021 18:14:08 +0200 |
parents | ce1fe22bda5a |
children | 04b3fb35910c |
files | pkg/xlsx/templater.go |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/xlsx/templater.go Tue Jun 22 17:12:17 2021 +0200 +++ b/pkg/xlsx/templater.go Tue Jun 22 18:14:08 2021 +0200 @@ -362,7 +362,7 @@ e.template.SetCellFormula(e.destinationSheet, dst, s) } if s, err := e.template.GetCellValue(e.sourceSheet, src); err == nil { - if v, err := e.expand(s, vars); err == nil { + if v, err := e.typedExpand(s, vars); err == nil { e.template.SetCellValue(e.destinationSheet, dst, v) } } @@ -462,11 +462,11 @@ if err != nil { return err } - value, err = e.expand(value, vars) + nvalue, err := e.typedExpand(value, vars) if err != nil { return err } - if err := e.template.SetCellStr(destination, axis, value); err != nil { + if err := e.template.SetCellValue(destination, axis, nvalue); err != nil { return err } } @@ -579,6 +579,9 @@ return "" } s, err = eval.EvalString(e.ctx, vars) + if err != nil { + log.Printf("error: '%s' '%s' %v\n", str, s, err) + } return s } @@ -614,7 +617,6 @@ } if repCount == 1 && strings.HasPrefix(str, "{{") && strings.HasSuffix(str, "}}") { - // log.Printf("typed eval: %T\n", last) return last, nil } return nstr, nil