From: John Dong <jdong@mit.edu>
Date: Fri, 31 Aug 2007 16:59:55 +0000 (-0400)
Subject: Merge jdong
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/07c4c28f94d7628c0d5c48db810956f680c5f48e?hp=df1e1ca70a2c618eb376ea6b61207c726beac31d

Merge jdong
---

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index b9c790f..cc57bb5 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -185,8 +185,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
diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml
index ea276d7..cdfc049 100644
--- a/app/views/quickvote/list_voters.rhtml
+++ b/app/views/quickvote/list_voters.rhtml
@@ -38,11 +38,11 @@
             end
             
             %>
-        <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
+        <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host.reverse.slice(0,30).reverse)%>
       </td>
       <td>
         <%org=(w.all.grep(/^(OrgName|org-name)/)[0] or "").sub(/^(OrgName|org-name)\:/,'').strip+" - "+ (w.all.grep(/^(NetName|netname)/)[0] or "").sub(/^(NetName|netname)\:/,'').strip %>
-        <% if org =~ /IANA/ %>
+        <% if org =~ /asdfasdf/ %>
           <%= "No additional information" %>
         <% else %>
           <%= h(org) %>
diff --git a/lib/whois/whois.rb b/lib/whois/whois.rb
index 7cc6e9d..962a399 100755
--- a/lib/whois/whois.rb
+++ b/lib/whois/whois.rb
@@ -130,7 +130,7 @@ module Whois
             if ip_range.include? self.ip and l[1].length > 0
               return Object.instance_eval("Server::#{l[1]}.new")
             end
-            return Server::Ripe.new
+            return Server::Arin.new
           end
         end
 
@@ -139,7 +139,7 @@ module Whois
           ipv6_list = YAML::load_file(File.dirname(__FILE__) + '/data/ipv6.yaml')
           server = server_with_hash(ipv6_list)
           unless server.kind_of? Server::Server
-            return Server::Ripe.new
+            return Server::Arin.new
           else
             return server
           end