diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2010-08-11 08:48:02 +0200 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2010-08-11 08:48:02 +0200 |
| commit | 26369d68b9edcf053789e2d024e0286fd517a29d (patch) | |
| tree | 1da11b9beef0df56a291f836e6a6cf46bfacaa01 /lib/dataset.rb | |
| parent | 2806bfff8a01f75351f31c5bd676b25b2fb36017 (diff) | |
| parent | 44d05cec5a612f50f8a61ccd762c8176a0b8fd68 (diff) | |
Merge remote branch 'helma/master' into test
Diffstat (limited to 'lib/dataset.rb')
| -rw-r--r-- | lib/dataset.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb index 84b1ec0..654a275 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -31,8 +31,7 @@ module OpenTox def self.find(uri, accept_header=nil) unless accept_header - #if uri.match(@@config[:services]["opentox-dataset"]) || uri=~ /188.40.32.88/ || uri =~ /informatik/ - if (uri.match(@@config[:services]["opentox-dataset"]) || uri =~ /in-silico.ch/) && !@@config[:accept_headers]["opentox-dataset"].grep(/yaml/).empty? + if (@@config[:yaml_hosts].include?(URI.parse(uri).host)) accept_header = 'application/x-yaml' else accept_header = "application/rdf+xml" |