Changeset 213 for trunk/lib/Vote/DB/Poll.pm

Timestamp:

04/16/09 20:47:17 (15 years ago)

Author:

nanardon

Message:

• more tests and the fix need to have it passing

File:

• trunk/lib/Vote/DB/Poll.pm (modified) (7 diffs)

trunk/lib/Vote/DB/Poll.pm

@@ -363 +363 @@
         : $self->_register_ballot_clear($choice, $fchoice))
         or do {
-            self->rollback;
+            $self->rollback;
             return;
         };
@@ -380 +380 @@
     $uid ||= Vote::DB::common::gen_uid();
     $addb->execute($uid, $self->voteid, scalar(@{$fchoice || []}) ? undef : 'f') or do {
-        self->rollback;
+        $self->rollback;
         return;
     };
 
     $self->_register_ballot_items($uid, $choice, $fchoice) or do {
-        self->rollback;
+        $self->rollback;
         return;
     };
@@ -395 +395 @@
     my ($self, $value) = @_;
 
-    my $sth = $self->prepare_cached(
+    my $sth = $self->db->prepare_cached(
         q{select key from choice where lower(label) = ? and poll = ?}
     );
-    $sth->execute(lc($value), $self->pollid);
+    $sth->execute(lc($value), $self->voteid);
     my $res = $sth->fetchrow_hashref;
     $sth->finish;
@@ -510 +510 @@
     $self->commit;
 
-    
     $uid
 }
@@ -772 +771 @@
     my $sth = $self->db->prepare_cached(
         q{
-        insert in ballot_map (poll, "from", to) values (?,?,?)
+        insert into ballot_map (poll, "from", "to") values (?,?,?)
         }
     );
@@ -786 +785 @@
     $mail =~ s/^\s*//;
     $mail = lc($mail);
+    $id ||= '';
     $id =~ s/\s*$//;
     $id =~ s/^\s//;
@@ -794 +794 @@
     );
 
-    if ($upd->execute($id || '', $mail, $self->voteid) == 0) {
+    if ($upd->execute($id, $mail, $self->voteid) == 0) {
         my $add = $self->db->prepare_cached(q{
             insert into voting (poll, label, mail) values (?,?,?)