godoc: more cleanup
cmd/godoc/godoc.go is now merged into main.go, which is now
only 530 lines.
App Engine mode is still broken, but should be easy to fix up.
(just needs a global *godoc.Presentation created in init)
R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/11498044
diff --git a/godoc/server.go b/godoc/server.go
index 9b2149b..91b3960 100644
--- a/godoc/server.go
+++ b/godoc/server.go
@@ -213,7 +213,7 @@
}
if mode&NoHTML != 0 {
- h.p.ServeText(w, applyTemplate(PackageText, "packageText", info))
+ h.p.ServeText(w, applyTemplate(h.p.PackageText, "packageText", info))
return
}
@@ -253,7 +253,7 @@
Title: title,
Tabtitle: tabtitle,
Subtitle: subtitle,
- Body: applyTemplate(PackageHTML, "packageHTML", info),
+ Body: applyTemplate(h.p.PackageHTML, "packageHTML", info),
})
}
@@ -463,7 +463,7 @@
p.ServePage(w, Page{
Title: "Directory " + relpath,
Tabtitle: relpath,
- Body: applyTemplate(DirlistHTML, "dirlistHTML", list),
+ Body: applyTemplate(p.DirlistHTML, "dirlistHTML", list),
})
}
@@ -587,12 +587,12 @@
FileServer.ServeHTTP(w, r)
}
-func serveSearchDesc(w http.ResponseWriter, r *http.Request) {
+func (p *Presentation) serveSearchDesc(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/opensearchdescription+xml")
data := map[string]interface{}{
"BaseURL": fmt.Sprintf("http://%s", r.Host),
}
- if err := SearchDescXML.Execute(w, &data); err != nil && err != http.ErrBodyNotAllowed {
+ if err := p.SearchDescXML.Execute(w, &data); err != nil && err != http.ErrBodyNotAllowed {
// Only log if there's an error that's not about writing on HEAD requests.
// See Issues 5451 and 5454.
log.Printf("searchDescXML.Execute: %s", err)
