lib/bio/db/fantom.rb in bio-1.2.1 vs lib/bio/db/fantom.rb in bio-1.3.0

@@ -2,17 +2,15 @@
 # bio/db/fantom.rb - RIKEN FANTOM2 database classes
 #
 # Copyright:: Copyright (C) 2003 GOTO Naohisa <[e-mail]> 
 # License::   The Ruby License
 #
-#  $Id: fantom.rb,v 1.14 2007/04/05 23:35:40 trevor Exp $
+#  $Id:$
 #
 
-begin
-  require 'rexml/document'
-  rescue LoadError
-end
+require 'rexml/document'
+require 'cgi'
 require 'uri'
 require 'net/http'
 
 require 'bio/db'
 require 'bio/command'
@@ -30,20 +28,20 @@
     module_function :query
 
     def get_by_id(idstr, http_proxy = nil)
       addr = 'fantom.gsc.riken.go.jp'
       port = 80
-      path = "/db/maxml/maxmlseq.cgi?masterid=#{URI.escape(idstr.to_s)}&style=xml"
+      path = "/db/maxml/maxmlseq.cgi?masterid=#{CGI.escape(idstr.to_s)}&style=xml"
       xml = ''
       if http_proxy then
         proxy = URI.parse(http_proxy.to_s)
         Net::HTTP.start(addr, port, proxy.host, proxy.port) do |http|
-          response, = http.get(path)
+          response = http.get(path)
           xml = response.body
         end
       else
         Bio::Command.start_http(addr, port) do |http|
-          response, = http.get(path)
+          response = http.get(path)
           xml = response.body
         end
       end
       xml
     end