archives/trantor
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use clousures for the http handlers

Browse source
This commit is contained in:
Las Zenow 2012-08-15 13:58:16 +02:00
parent f1eab1bebc
commit 3db6231762
3 changed files with 54 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
search.go
View file

@ -31,7 +31,8 @@ type searchData struct {
Prev string Prev string
} }
func searchHandler(coll *mgo.Collection, w http.ResponseWriter, r *http.Request) { func searchHandler(coll *mgo.Collection) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm() err := r.ParseForm()
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
@ -65,4 +66,5 @@ func searchHandler(coll *mgo.Collection, w http.ResponseWriter, r *http.Request)
data.Prev = "/search/?q=" + req + "&p=" + strconv.Itoa(page-1) data.Prev = "/search/?q=" + req + "&p=" + strconv.Itoa(page-1)
} }
loadTemplate(w, "search", data) loadTemplate(w, "search", data)
}
} }

10
trantor.go
View file

@ -16,10 +16,12 @@ func aboutHandler(w http.ResponseWriter, r *http.Request) {
loadTemplate(w, "about", nil) loadTemplate(w, "about", nil)
} }
func bookHandler(coll *mgo.Collection, w http.ResponseWriter, r *http.Request) { func bookHandler(coll *mgo.Collection) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
var book Book var book Book
coll.Find(bson.M{"title": r.URL.Path[len("/book/"):]}).One(&book) coll.Find(bson.M{"title": r.URL.Path[len("/book/"):]}).One(&book)
loadTemplate(w, "book", book) loadTemplate(w, "book", book)
}
} }
@ -37,9 +39,9 @@ func main() {
coll := session.DB(DB_NAME).C(BOOKS_COLL) coll := session.DB(DB_NAME).C(BOOKS_COLL)
num, _ := coll.Count() num, _ := coll.Count()
http.HandleFunc("/book/", func(w http.ResponseWriter, r *http.Request) { bookHandler(coll, w, r) }) http.HandleFunc("/book/", bookHandler(coll))
http.HandleFunc("/search/", func(w http.ResponseWriter, r *http.Request) { searchHandler(coll, w, r) }) http.HandleFunc("/search/", searchHandler(coll))
http.HandleFunc("/upload/", func(w http.ResponseWriter, r *http.Request) { uploadHandler(coll, w, r) }) http.HandleFunc("/upload/", uploadHandler(coll))
http.HandleFunc("/about/", aboutHandler) http.HandleFunc("/about/", aboutHandler)
fileHandler("/img/") fileHandler("/img/")
fileHandler("/cover/") fileHandler("/cover/")

4
upload.go
View file

@ -42,7 +42,8 @@ func storeFile(r *http.Request) error {
return nil return nil
} }
func uploadHandler(coll *mgo.Collection, w http.ResponseWriter, r *http.Request) { func uploadHandler(coll *mgo.Collection) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
status := "" status := ""
if r.Method == "POST" { if r.Method == "POST" {
err := storeFile(r) err := storeFile(r)
@ -54,4 +55,5 @@ func uploadHandler(coll *mgo.Collection, w http.ResponseWriter, r *http.Request)
} }
loadTemplate(w, "upload", status) loadTemplate(w, "upload", status)
}
} }