diff options
Diffstat (limited to 'handler.go')
| -rw-r--r-- | handler.go | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -17,12 +17,12 @@ const ( VALID_ID_REGEX = `^[0-9]+$` ) -func indexGet(w http.ResponseWriter, r *http.Request, db *Database) { +func indexGet(w http.ResponseWriter, r *http.Request) { // get data from database cmd := "SELECT id,title FROM recipes ORDER BY title;" log.Printf("Query: %s", cmd) - rows, err := db.Backend.Query(cmd) + rows, err := db.Query(cmd) if err != nil { http.Error(w, "Failed to load recipes from database.", 500) return @@ -53,7 +53,7 @@ func indexGet(w http.ResponseWriter, r *http.Request, db *Database) { ServeTemplate(w, "index", path, elements) } -func recipeGet(w http.ResponseWriter, r *http.Request, db *Database) { +func recipeGet(w http.ResponseWriter, r *http.Request) { // get id from URL parameters ids := r.URL.Query()["id"] @@ -74,7 +74,7 @@ func recipeGet(w http.ResponseWriter, r *http.Request, db *Database) { // get data from database cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr) log.Printf("Query: %s", cmd) - rows, err := db.Backend.Query(cmd) + rows, err := db.Query(cmd) if err != nil { http.Error(w, "Database returned error: " + err.Error(), 500) return @@ -120,7 +120,7 @@ func recipeGet(w http.ResponseWriter, r *http.Request, db *Database) { ServeTemplate(w, "recipe", path, elements[0]) } -func recipePost(w http.ResponseWriter, r *http.Request, db *Database) { +func recipePost(w http.ResponseWriter, r *http.Request) { // get id from URL parameters ids := r.URL.Query()["id"] @@ -141,10 +141,10 @@ func recipePost(w http.ResponseWriter, r *http.Request, db *Database) { // read request body buffer,_ := ioutil.ReadAll(r.Body) // FIXME error handling body := string(buffer) - updateRecipe(db, body, idStr) + updateRecipe(body, idStr) } -func recipeEditGet(w http.ResponseWriter, r *http.Request, db *Database) { +func recipeEditGet(w http.ResponseWriter, r *http.Request) { // get id from URL parameters ids := r.URL.Query()["id"] @@ -164,7 +164,7 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request, db *Database) { // get data from database cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr) log.Printf("Query: %s", cmd) - rows, err := db.Backend.Query(cmd) + rows, err := db.Query(cmd) if err != nil { http.Error(w, "Got error from database: " + err.Error(), 500) return @@ -205,7 +205,7 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request, db *Database) { ServeTemplate(w, "recipe", path, elements[0]) } -func recipeEditPost(w http.ResponseWriter, r *http.Request, db *Database) { +func recipeEditPost(w http.ResponseWriter, r *http.Request) { // get id from URL parameters ids := r.URL.Query()["id"] @@ -225,13 +225,13 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request, db *Database) { // read request body buffer,_ := ioutil.ReadAll(r.Body) // FIXME error handling body := string(buffer) - updateRecipe(db, body, idStr) + updateRecipe(body, idStr) } -func updateRecipe(db *Database, body string, idStr string) { +func updateRecipe(body string, idStr string) { // execute SQL UPDATE - _,_ = db.Backend.Exec(` + _,_ = db.Exec(` UPDATE recipes SET @@ -275,14 +275,14 @@ func addRecipesGet(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, path) } -func addRecipesPost(w http.ResponseWriter, r *http.Request, db *Database) { +func addRecipesPost(w http.ResponseWriter, r *http.Request) { url := r.FormValue("url") title := r.FormValue("title") cmd := fmt.Sprintf("INSERT INTO recipes (title,upstream_url) VALUES ('%s', '%s')", title, url) log.Println(cmd) - res,err := db.Backend.Exec(cmd) + res,err := db.Exec(cmd) if err != nil { http.Error(w, "Could not add recipe.", 500) return |