- Timestamp:
- 04/15/09 03:51:26 (15 years ago)
- Location:
- trunk/lib/Vote
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/Vote/Controller/Admin.pm
r190 r198 24 24 sub begin : Private { 25 25 my ( $self, $c, @args ) = @_; 26 $c->model('Vote')-> db->rollback;26 $c->model('Vote')->rollback; 27 27 } 28 28 … … 43 43 if ($c->req->param('addch')) { 44 44 $vote->vote_add_choice($id, $c->req->param('addch')) 45 and $vote-> db->commit;45 and $vote->commit; 46 46 } elsif ($c->req->param('delch')) { 47 47 $vote->delete_choice($c->req->param('delch')) 48 and $vote-> db->commit;48 and $vote->commit; 49 49 } elsif ($c->req->param('pollparam')) { 50 50 if ($c->req->param('dstart')) { … … 77 77 grep { exists($c->req->params->{$_}) } 78 78 qw(label description start end choice_count free_choice) 79 ) and $vote-> db->commit;79 ) and $vote->commit; 80 80 } elsif ($c->req->param('encrypted')) { 81 81 my $passphrase = $c->req->param('passphrase') || 82 82 $c->session->{'vpass' . $c->stash->{voteid}}; 83 83 $poll->gen_poll_keys($passphrase) 84 and $vote-> db->commit;84 and $vote->commit; 85 85 } elsif ($c->req->param('notcrypted')) { 86 86 $poll->param(public_key => undef, private_key => undef) 87 and $vote-> db->commit;87 and $vote->commit; 88 88 } 89 89 }; … … 95 95 $upload->fh, 96 96 $c->req->param('delete'), 97 ) and $vote-> db->commit;97 ) and $vote->commit; 98 98 } elsif($c->req->param('delvoting')) { 99 99 $vote->delete_voting($c->req->param('delvoting')) 100 and $vote-> db->commit;100 and $vote->commit; 101 101 } elsif ($c->req->param('mail')) { 102 102 $vote->addupd_voting($id, $c->req->param('mail'), $c->req->param('id')) 103 and $vote-> db->commit;103 and $vote->commit; 104 104 } elsif($c->req->param('mailpasswd')) { 105 105 # TODO … … 137 137 } elsif($c->req->param($bid) eq 'invalid') { 138 138 $vote->mark_ballot_invalid($bid, 1); 139 $vote-> db->commit;139 $vote->commit; 140 140 } elsif($c->req->param($bid) eq 'valid') { 141 141 $vote->mark_ballot_invalid($bid, 0); 142 $vote-> db->commit;142 $vote->commit; 143 143 } 144 144 } -
trunk/lib/Vote/Controller/Ballot.pm
r181 r198 24 24 sub begin : Private { 25 25 my ( $self, $c ) = @_; 26 $c->model('Vote')-> db->rollback;26 $c->model('Vote')->rollback; 27 27 } 28 28 -
trunk/lib/Vote/Controller/Newpoll.pm
r186 r198 24 24 sub begin : Private { 25 25 my ( $self, $c ) = @_; 26 $c->model('Vote')-> db->rollback;27 $c->model('Vote')->clean_old_poll_request and $c->model('Vote')-> db->commit;26 $c->model('Vote')->rollback; 27 $c->model('Vote')->clean_old_poll_request and $c->model('Vote')->commit; 28 28 } 29 29 -
trunk/lib/Vote/Controller/Root.pm
r190 r198 29 29 sub begin : Private { 30 30 my ( $self, $c ) = @_; 31 $c->model('Vote')-> db->rollback;31 $c->model('Vote')->rollback; 32 32 } 33 33 -
trunk/lib/Vote/Controller/Vote.pm
r184 r198 24 24 sub begin : Private { 25 25 my ( $self, $c ) = @_; 26 $c->model('Vote')-> db->rollback;26 $c->model('Vote')->rollback; 27 27 } 28 28 -
trunk/lib/Vote/DB.pm
r194 r198 316 316 my $rinfo = $self->poll_request_info($rid) or return; 317 317 318 $self->create_poll($rinfo->{mail}, $rinfo->{label}, $passwd); 319 320 my $delreq = $self->db->prepare_cached( 321 q{delete from poll_request where id = ?} 322 ); 323 324 $delreq->execute($rid); 325 $self->commit; 326 } 327 328 sub create_poll { 329 my ($self, $mail, $label, $passwd) = @_; 330 318 331 my $encpasswd = $self->gen_enc_passwd($passwd); 319 332 … … 328 341 ); 329 342 330 $newpoll->execute($newpollid, $ rinfo->{label}, $rinfo->{mail}, $encpasswd);343 $newpoll->execute($newpollid, $label, $mail, $encpasswd); 331 344 # set some default 332 345 $self->poll($newpollid)->setup() or do { 333 $self-> db->rollback;346 $self->rollback; 334 347 return; 335 348 }; 336 349 337 my $delreq = $self->db->prepare_cached(338 q{delete from poll_request where id = ?}339 );340 341 $delreq->execute($rid);342 $self->db->commit;343 350 344 351 $newpollid 345 352 } 353 346 354 347 355 sub create_poll_request { … … 356 364 357 365 $addreq->execute($reqid, $info{label}, $info{mail}); 358 $self-> db->commit;366 $self->commit; 359 367 $reqid; 360 368 } -
trunk/lib/Vote/DB/Poll.pm
r196 r198 60 60 $sth->execute((map { $attr{$_} } grep { exists $attr{$_} } @online_f), $self->voteid) 61 61 or do { 62 $self-> db->rollback;62 $self->rollback; 63 63 return; 64 64 }; … … 264 264 265 265 $sth->execute($self->voteid, $label) or do { 266 $self-> db->rollback;266 $self->rollback; 267 267 return; 268 268 }; … … 292 292 ); 293 293 $sth->execute($vinfo->{key}, $referal) or do { 294 $self-> db->rollback;294 $self->rollback; 295 295 return; 296 296 }; … … 306 306 : $self->_register_ballot_clear($choice, $fchoice)) 307 307 or do { 308 self-> db->rollback;308 self->rollback; 309 309 return; 310 310 }; … … 323 323 $uid ||= Vote::DB::common::gen_uid(); 324 324 $addb->execute($uid, $self->voteid, scalar(@{$fchoice || []}) ? undef : 'f') or do { 325 self-> db->rollback;325 self->rollback; 326 326 return; 327 327 }; 328 328 329 329 $self->_register_ballot_items($uid, $choice, $fchoice) or do { 330 self-> db->rollback;330 self->rollback; 331 331 return; 332 332 }; … … 357 357 foreach (@{ $choice || []}) { 358 358 $addbc->execute($uid, $_, 't') or do { 359 $self-> db->rollback;359 $self->rollback; 360 360 return; 361 361 }; … … 365 365 my $chkey = $self->find_choice_key($_); 366 366 $addbc->execute($uid, $_, $chkey ? 't' : 'f') or do { 367 $self-> db->rollback;367 $self->rollback; 368 368 return; 369 369 }; … … 421 421 my $upd = $self->db->prepare_cached(q{update ballot_enc set decrypted = true where id = ?}); 422 422 if ($upd->execute($ballotid)) { 423 $self-> db->commit;423 $self->commit; 424 424 return; 425 425 } else { 426 $self-> db->rollback;426 $self->rollback; 427 427 return 1; 428 428 } … … 451 451 } 452 452 # everything went fine, saving! 453 $self-> db->commit;453 $self->commit; 454 454 455 455 … … 715 715 ); 716 716 717 $sth->execute($self->voteid, $from, $to) or $self-> db->rollback;718 $self-> db->commit;717 $sth->execute($self->voteid, $from, $to) or $self->rollback; 718 $self->commit; 719 719 } 720 720 … … 754 754 my ($mail, $name) = split(';', $line); 755 755 $mail or do { 756 $self-> db->rollback;756 $self->rollback; 757 757 return; 758 758 }; -
trunk/lib/Vote/DB/Voting.pm
r182 r198 90 90 91 91 $upd_voting->execute($encpasswd, $self->votingkey); 92 $self-> db->commit;92 $self->commit; 93 93 $passwd 94 94 } -
trunk/lib/Vote/DB/common.pm
r197 r198 98 98 ) 99 99 ); 100 $res or $self-> db->rollback;100 $res or $self->rollback; 101 101 } 102 102 … … 111 111 ); 112 112 $sth->execute or do { 113 $self-> db->rollback;113 $self->rollback; 114 114 return; 115 115 };
Note: See TracChangeset
for help on using the changeset viewer.