X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/e7df11018ea1e15f8671f948126632be3ac86e84..ce1489ae318bfe129070ecaf4e5c422015572caf:/app/models/election.rb?ds=sidebyside

diff --git a/app/models/election.rb b/app/models/election.rb
index 7fa138e..99d64f9 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -88,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
@@ -129,7 +149,6 @@ class Election < ActiveRecord::Base
     
     names
   end
-  
 end