Changeset 199 for trunk

Timestamp:

04/15/09 04:59:53 (15 years ago)

Author:

nanardon

Message:

• add an uid to the vote, currently poll are identified by an id generated by the database (sequence), in the case poll is dump/restore, this id may change, we hope uuid will never

Location:

trunk/lib/Vote

Files:

• DB.pm (modified) (1 diff)
• DB/Poll.pm (modified) (6 diffs)
• DB/common.pm (modified) (1 diff)

trunk/lib/Vote/DB.pm

@@ -92 +92 @@
 sub poll {
     my ($self, $pollid) = @_;
-    Vote::DB::Poll->new($self->{dbstring}, $pollid);
+    Vote::DB::Poll->new($self->{dbstring}, $self->poll_id_from_uid($pollid));
 }
 
 sub results {
     my ($self, $pollid) = @_;
-    Vote::DB::Poll::Results->new($self->{dbstring}, $pollid);
+    Vote::DB::Poll::Results->new($self->{dbstring}, $self->poll_id_from_uid($pollid));
 }
 

trunk/lib/Vote/DB/Poll.pm

@@ -38 +38 @@
 sub voteid { $_[0]->{voteid} }
 
+sub uid {
+    my ($self) = @_;
+    # UID will come only with epoll 2.0, if no uid, using key
+    return $self->info('uid') || $self->voteid;
+}
+
 sub setup {
     my ($self) = @_;
@@ -43 +49 @@
         free_choice => 0,
         choice_count => 1,
-    );
-}
+        uid => Vote::DB::common::gen_uid(),
+    );
+}
+
+sub _online_f { qw(label start end owner password) }
 
 sub param {
@@ -50 +59 @@
 
     keys %attr or return;
-    my @online_f = qw(label start end owner password);
+    my @online_f = _online_f();
 
     if (grep { exists($attr{$_}) } @online_f) {
@@ -97 +106 @@
 }
 
-sub info {
+sub _info {
     my ($self) = @_;
 
@@ -114 +123 @@
     my $res = $sth->fetchrow_hashref;
     $sth->finish;
-    if ($res) {
+    $res
+}
+
+sub info {
+    my ($self, $var) = @_;
+
+    my $default = {
+        free_choice => 0, # avoid undef in some case
+    };
+
+    if ($var) {
+        if (grep { $var eq $_ } (_online_f(), qw(dstart hstart dend hend))) {
+            return $self->_info->{$var};
+        } else {
+            my $sth = $self->db->prepare_cached(
+                q{select val from settings where poll = ? and var = ?}
+            );
+            $sth->execute($self->voteid, $var);
+            my $res = $sth->fetchrow_hashref;
+            $sth->finish;
+            return defined($res->{$var})
+                ? $res->{$var}
+                : $default->{$var};
+        }
+    }
+
+    if (my $res = $self->_info) {
         my $get = $self->db->prepare_cached(
             q{select var, val from settings where poll = ?}
@@ -122 +157 @@
             $res->{$set->{var}} = $set->{val};
         }
-    }
-    $res->{free_choice} ||= 0; # avoiding undef
-    $res
+        foreach (keys %$default) {
+            $res->{$_} = $default->{$_} if (!defined($res->{$_}));
+        }
+        return $res
+    }
 }
 

trunk/lib/Vote/DB/common.pm

@@ -119 +119 @@
 }
 
+sub poll_id_from_uid {
+    my ($self, $uid) = @_;
+    if (length($uid) == 32) {
+        my $sth = $self->db->prepare_cached(
+            q{ select poll from settings where var = 'uid' and val = ?
+                order by poll }
+        );
+        $sth->execute($uid);
+        my $res = $sth->fetchrow_hasref;
+        $sth->finish;
+        return $res->{poll} || $uid;
+    }
+    $uid
+}
+
 sub gen_uid {
     unpack("H*", join("", map { chr(rand(256)) } (0..15)))