# HG changeset patch # User Sascha L. Teichmann # Date 1533653099 -7200 # Node ID e170075c22ac1fbb37c1adf7511c54e0dc01c753 # Parent aa24b56918388ee2243fa7cf5205590dbedb974b Cosmetics: Unindent some code in WFS proxy. diff -r aa24b5691838 -r e170075c22ac controllers/externalwfs.go --- a/controllers/externalwfs.go Tue Aug 07 16:40:08 2018 +0200 +++ b/controllers/externalwfs.go Tue Aug 07 16:44:59 2018 +0200 @@ -148,43 +148,46 @@ resp.Header.Del("X-Gemma-From") resp.Header.Del("X-Gemma-To") - if isXML(resp.Header) { - log.Printf("rewrite from %s to %s\n", from, to) + if !isXML(resp.Header) { + return nil + } - pr, pw := io.Pipe() + log.Printf("rewrite from %s to %s\n", from, to) + + pr, pw := io.Pipe() - var ( - r io.ReadCloser - w io.WriteCloser - err error - ) + var ( + r io.ReadCloser + w io.WriteCloser + err error + ) - reader, writer := encoding(resp.Header) + reader, writer := encoding(resp.Header) - if r, err = reader(resp.Body); err != nil { - return err - } + if r, err = reader(resp.Body); err != nil { + return err + } - if w, err = writer(pw); err != nil { - return err - } + if w, err = writer(pw); err != nil { + return err + } - go func(force io.ReadCloser) { - defer func() { - //r.Close() - w.Close() - pw.Close() - force.Close() - }() - if err := rewrite(w, r, from, to); err != nil { - log.Printf("rewrite failed: %v\n", err) - return - } - log.Println("rewrite successful") - }(resp.Body) + go func(force io.ReadCloser) { + defer func() { + //r.Close() + w.Close() + pw.Close() + force.Close() + }() + if err := rewrite(w, r, from, to); err != nil { + log.Printf("rewrite failed: %v\n", err) + return + } + log.Println("rewrite successful") + }(resp.Body) - resp.Body = pr - } + resp.Body = pr + return nil }