X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/eed173db706db097ec48a83059d9879a56e2dd4b..6a935d078f20d2b1b0d60f0a30c41a642d40758a:/app/models/election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index cd809ab..7d8ad80 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -1,3 +1,21 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+
 class Election < ActiveRecord::Base
   has_many :candidates
   has_many :voters
@@ -91,14 +109,14 @@ class Election < ActiveRecord::Base
   #Calculate results if not in memcache
   def results
     # Assignment is intentional
-    if defined? Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+    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 defined? Cache
+    elsif Cache
       # memcache is available, but missed.
       results = self.results!
       Cache.set("election_results:#{id}:#{self.votes.length}", results)