X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/f2db874f06622e5b7422dabc8e17396708277c56..6a935d078f20d2b1b0d60f0a30c41a642d40758a:/app/controllers/quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index da2903d..f7ad5ff 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.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 QuickvoteController < ApplicationController
   layout 'main'
   require_dependency "quick_voter"
@@ -115,7 +133,7 @@ class QuickvoteController < ApplicationController
 	      @voter.reload
       end
     else
-      redirect_to :controller => 'site'
+      redirect_to :controller => 'front'
     end
   end
 
@@ -161,15 +179,21 @@ class QuickvoteController < ApplicationController
     redirect_to quickvote_url( :ident => params[:ident] )
   end
 		
-  def mapvoters
+  def list_voters
     @map = GMap.new("map_div_id") 
     @map.control_init(:large_map => true, :map_type => true) 
     center = nil
-
-    QuickVote.ident_to_quickvote(params[:id]).voters.each do |voter|
+    @election=QuickVote.ident_to_quickvote(params[:id])
+    @election.voters.each do |voter|
       next unless voter.ipaddress
-
-      location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
+      location=nil
+      if defined? Cache and location=Cache.get("GEO:#{voter.ipaddress}")
+      elsif defined? Cache
+        location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
+        Cache.set "GEO:#{voter.ipaddress}", location
+      else
+        location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
+      end
       next unless location.lng and location.lat
 
       unless center
@@ -179,8 +203,7 @@ class QuickvoteController < ApplicationController
 
       marker = GMarker.new([location.lat,location.lng],
                            :title => "Voter",
-                           :info_window => (voter.ipaddress or "unknown") \
-                                           + "   " + voter.vote.votestring)
+                           :info_window => (voter.ipaddress or "unknown"))
       @map.overlay_init(marker)
     end
   end
@@ -193,7 +216,7 @@ class QuickvoteController < ApplicationController
   def results
     unless @election = QuickVote.ident_to_quickvote(params[:ident])
       flash[:notice] = "Cannot find quickvote #{params[:ident]}."
-      redirect_to :controller => 'site'
+      redirect_to :controller => 'front'
       return
     end
     if @election.viewable == 0 && @election.active == 1