Skip to content

Fix listing of organisations/networks with same name #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moneytoo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix listing of organisations/networks with same name #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd22b3
Fix listing of organisations/networks with same name
moneytoo Sep 23, 2013
48e9592
Fix parsing of single organisation returned in search
moneytoo Sep 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions netlist.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
org_search_results = Subexec.run("curl -s -H \"Accept: application/json\" \"http://whois.arin.net/rest/orgs;name=#{target_org}*\"").output
begin
org_search_results = JSON.parse(org_search_results)
org_search_results["orgs"]["orgRef"].each do |org|
orgs[org["@name"]] = {:handle => org["@handle"] }
results = org_search_results["orgs"]["orgRef"]
results = [results] if results.kind_of? Hash
results.each do |org|
orgs[org["@handle"]] = {:name => org["@name"] }
end
rescue
""
Expand All @@ -23,20 +25,20 @@

orgs.each do |org, info|
orgs[org][:nets] = {}
nets_search_results = Subexec.run("curl -s -H \"Accept: application/json\" \"http://whois.arin.net/rest/org/#{info[:handle]}/nets\"").output
nets_search_results = Subexec.run("curl -s -H \"Accept: application/json\" \"http://whois.arin.net/rest/org/#{org}/nets\"").output
begin
nets_search_results = JSON.parse(nets_search_results)
nets_search_results["nets"]["netRef"] = [nets_search_results["nets"]["netRef"]] if nets_search_results["nets"]["netRef"].class != Array
nets_search_results["nets"]["netRef"].each do |info|
orgs[org][:nets][info["@name"]] = { :start => info["@startAddress"], :end => info["@endAddress"] }
orgs[org][:nets][info["@handle"]] = { :start => info["@startAddress"], :end => info["@endAddress"] }
end
rescue
""
end
end

orgs.each do |k, v|
puts "----- #{k} (#{v[:handle]}) -----"
puts "----- #{v[:name]} (#{k}) -----"
v[:nets].each do |netk, netv|
puts "\n* #{netk}\n #{netv[:start]} - #{netv[:end]}\n"
end
Expand Down