qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 22:04:39 -07:00
Code Releases Activity

Codelab: correct function definitions for handlers before closures are introduced.

Browse Source 
A couple of post-closure function definitions were introduced too early, making the resulting
code fail compilation.

Also, the TitleValidator regexp was missing.

R=adg
CC=golang-dev
https://golang.org/cl/4105054
This commit is contained in:
Andrey Mirtchovski 2011-02-07 09:23:18 +01:00 committed by Andrew Gerrand
parent ab2aca5e52
commit 61c93cac3e
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/codelab/wiki/index.html
View File

@ -573,7 +573,11 @@ redirect the client to the edit Page so the content may be created:
</p>
<pre>
func viewHandler(w http.ResponseWriter, r *http.Request, title string) {
func viewHandler(w http.ResponseWriter, r *http.Request) {
title, err := getTitle(w, r)
if err != nil {
return
}
p, err := loadPage(title)
if err != nil {
http.Redirect(w, r, &#34;/edit/&#34;+title, http.StatusFound)
@ -658,10 +662,14 @@ Now let's fix up <code>saveHandler</code>:
</p>
<pre>
func saveHandler(w http.ResponseWriter, r *http.Request, title string) {
func saveHandler(w http.ResponseWriter, r *http.Request) {
title, err := getTitle(w, r)
if err != nil {
return
}
body := r.FormValue(&#34;body&#34;)
p := &amp;Page{Title: title, Body: []byte(body)}
err := p.save()
err = p.save()
if err != nil {
http.Error(w, err.String(), http.StatusInternalServerError)
return
@ -747,6 +755,7 @@ Then we can create a global variable to store our validation regexp:
</p>
<pre>
var titleValidator = regexp.MustCompile(&#34;^[a-zA-Z0-9]+$&#34;)
</pre>
<p>

6
doc/codelab/wiki/wiki.html
View File

@ -477,7 +477,7 @@ redirect the client to the edit Page so the content may be created:
</p>
<pre>
!./srcextract.bin -src=final.go -name=viewHandler
!./srcextract.bin -src=final-noclosure.go -name=viewHandler
</pre>
<p>
@ -539,7 +539,7 @@ Now let's fix up <code>saveHandler</code>:
</p>
<pre>
!./srcextract.bin -src=final.go -name=saveHandler
!./srcextract.bin -src=final-noclosure.go -name=saveHandler
</pre>
<p>
@ -610,7 +610,7 @@ Then we can create a global variable to store our validation regexp:
</p>
<pre>
!./srcextract.bin -src=final-noclosure.go -name=TitleValidator
!./srcextract.bin -src=final-noclosure.go -name=titleValidator
</pre>
<p>