X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/7b649ccad8804580632c255b9f451482fdbbe32d..f95bdca9d25333308ef2f0c80eb2011f42d4a5eb:/app/models/election.rb?ds=inline

diff --git a/app/models/election.rb b/app/models/election.rb
index a77f445..99d64f9 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -18,12 +18,12 @@ class Election < ActiveRecord::Base
   def initialize(params={})
     super
     self.enddate = read_attribute( :enddate ) || \
-                   Time.now + 14.days - 1.second
+                   Time.now + 30.days - 1.second
   end
 
   def other_methods
     if election_method
-      @other_methods = ELECTION_TYPES.reject {|i| i == election_method}
+      @other_methods = ELECTION_TYPES.keys.reject {|i| i == election_method}
     else
       @other_methods = nil
     end
@@ -34,12 +34,6 @@ class Election < ActiveRecord::Base
     read_attribute( :startdate ) || Time.now
   end
 
-  def enddate=(date)
-    date += 1.day
-    date = Time.gm(*date)
-    super(date)
-  end
-
   def votes
     votes = Array.new
     self.voters.each do |voter|
@@ -94,8 +88,28 @@ class Election < ActiveRecord::Base
     longdesc.length > 0 ? longdesc : nil 
   end
   
-  #Calculate Election Results
+  #Calculate results if not in memcache
   def results
+    # Assignment is intentional
+    if Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+      @plurality_result = c['plurality']
+      @approval_result = c['approval']
+      @condorcet_result = c['condorcet']
+      @ssd_result = c['ssd']
+      @borda_result = c['borda']
+      return c
+    elsif Cache
+      # memcache is available, but missed.
+      results = self.results!
+      Cache.set("election_results:#{id}:#{self.votes.length}", results)
+      return results
+    else
+      return self.results!
+    end
+  end
+
+  #Always Calculate Election Results
+  def results!
     # initalize the tallies to empty arrays
     preference_tally = Array.new
     plurality_tally = Array.new
@@ -135,7 +149,6 @@ class Election < ActiveRecord::Base
     
     names
   end
-  
 end