X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fiplookup.rb;h=9da167b08291e4141354b2b3f693ff5027670978;hb=c66e854af4f9d6be1947564638289fe781f1c9e9;hp=a3f8f952658723eb2c7ea7a9ef379b48d9c45daa;hpb=e101e9aaed7e1a7f8acdac870fc237275ae30bd2;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/iplookup.rb b/data/rbot/plugins/iplookup.rb
index a3f8f952..9da167b0 100644
--- a/data/rbot/plugins/iplookup.rb
+++ b/data/rbot/plugins/iplookup.rb
@@ -41,11 +41,11 @@ module ArinWhois
     end
     
     def location
-      "#{self['City']}, #{self['StateProv']}, #{self['Country']}"
+      [ self['City'], self['StateProv'], self['Country'] ].compact.join(', ')
     end
     
     def address
-      "#{self['Address']}, #{location}  #{self['PostalCode']}"
+      [ self['Address'], location, self['PostalCode'] ].compact.join(', ')
     end
     
   end
@@ -104,8 +104,8 @@ module ArinWhois
         result = Chunk.new
         
         chunk[0].scan(/([A-Za-z]+?):(.*)/).each do |tuple|
-          #puts tuple.inspect
-          result[tuple[0]] = tuple[1].strip
+          tuple[1].strip!
+          result[tuple[0]] = tuple[1].empty? ? nil : tuple[1]
         end
         
         result
@@ -190,8 +190,13 @@ class IPLookupPlugin < Plugin
   def iplookup(m, params)
     reply = ""
     if params[:domain]
-      ip = Resolv.getaddress(params[:domain])
-      reply += "(#{params[:domain]} = #{ip}) "
+      begin
+        ip = Resolv.getaddress(params[:domain])
+        reply += "#{params[:domain]} | "
+      rescue => e
+        m.reply "#{e.message}"
+        return
+      end
     else
       ip = params[:ip]
     end
@@ -216,7 +221,7 @@ plugin.map 'userip :user', :action => 'userip', :requirements => {:user => /\w+/
 
 if __FILE__ == $0
   include ArinWhois
-  data = open('whoiscgm.txt').read
+  data = open('whoistest.txt').read
   c = ArinWhoisParser.new data
   puts c.get_parsed_data.inspect
 end
\ No newline at end of file