From 07884e5c9b4fe423d10b1f4a9b6366f7d81cffb2 Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@mumsnet.com>
Date: Fri, 25 Jul 2014 15:41:58 +0100
Subject: Fixed voting to only vote for options for the given poll

---
 blavote.go | 4 ++--
 option.go  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blavote.go b/blavote.go
index 6dc1eee..7de8a56 100644
--- a/blavote.go
+++ b/blavote.go
@@ -14,7 +14,7 @@ var version string
 
 func main() {
 
-    version = "0.7"
+    version = "0.7.1"
 
     //Command line arguments
     var opts struct {
@@ -155,7 +155,7 @@ func vote(db *sqlite3.Conn, nick string, options []string) error {
         return err
     }
 
-    option, err := getOptionFromText(db, options[1])
+    option, err := getOptionFromText(db, options[1], pollId)
 
     if (err != nil) {
         return err
diff --git a/option.go b/option.go
index 0b41e0a..dd3055d 100644
--- a/option.go
+++ b/option.go
@@ -10,10 +10,10 @@ type Option struct {
     numVotes int64
 }
 
-func getOptionFromText(db*sqlite3.Conn, text string) (Option, error) {
+func getOptionFromText(db*sqlite3.Conn, text string, id int) (Option, error) {
 
-    args := sqlite3.NamedArgs{"$a": text}
-    sql := "SELECT * FROM options WHERE text = $a"
+    args := sqlite3.NamedArgs{"$a": text, "$b": id}
+    sql := "SELECT * FROM options WHERE text = $a and poll_id = $b"
     s, err := db.Query(sql, args)
     row := make(sqlite3.RowMap)
     
-- 
cgit v1.2.3