swap around the recent quickvotes

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 9c6337fdcf56ff78d7ee1d63a04ba1bfedf23bf0..99d64f93cc55424b34f82dac24d0dce9a1e4fc73 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -23,7 +23,7 @@ class Election < ActiveRecord::Base
 
   def other_methods
     if election_method
 
   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
     else
       @other_methods = nil
     end


@@ -88,8 +88,28 @@ class Election < ActiveRecord::Base
     longdesc.length > 0 ? longdesc : nil 
   end
   
     longdesc.length > 0 ? longdesc : nil 
   end
   

-  #Calculate Election Results
+  #Calculate results if not in memcache

   def results
   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
     # initalize the tallies to empty arrays
     preference_tally = Array.new
     plurality_tally = Array.new


@@ -129,7 +149,6 @@ class Election < ActiveRecord::Base
     
     names
   end
     
     names
   end

-  

 end
 
 
 end