diff --git lib/oddb/html/util/lookandfeel.rb lib/oddb/html/util/lookandfeel.rb index ad42b21..17763eb 100644 --- lib/oddb/html/util/lookandfeel.rb +++ lib/oddb/html/util/lookandfeel.rb @@ -5,7 +5,7 @@ require 'oddb/currency' require 'sbsm/lookandfeel' require 'sbsm/lookandfeelfactory' require 'sbsm/lookandfeelwrapper' -require 'turing' +#require 'turing' require 'fileutils' module ODDB diff --git lib/oddb/import/pharmnet.rb lib/oddb/import/pharmnet.rb index 7a59690..cda4446 100644 --- lib/oddb/import/pharmnet.rb +++ lib/oddb/import/pharmnet.rb @@ -12,7 +12,8 @@ require 'pp' module ODDB module Import module PharmNet -class EncodedParser < Mechanize::Page +#class EncodedParser < Mechanize::Page #mechanize 2.0 +class EncodedParser < WWW::Mechanize::Page @@iconv = Iconv.new('utf8', 'latin1') def initialize(uri=nil, response=nil, body=nil, code=nil) body = @@iconv.iconv(body.gsub(/iso-8859-1/i, 'utf-8')) diff --git lib/oddb/persistence/odba.rb lib/oddb/persistence/odba.rb index 66908c0..dfb3d77 100644 --- lib/oddb/persistence/odba.rb +++ lib/oddb/persistence/odba.rb @@ -26,7 +26,8 @@ module ODDB module ODBA end end - ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:pg:#{@config.db_name}", + #ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:pg:#{@config.db_name}", + ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:Pg:#{@config.db_name}", @config.db_user, @config.db_auth) ODBA.cache.setup end