diff options
| author | rautenberg <rautenberg@in-silico.ch> | 2012-07-13 09:45:46 +0200 |
|---|---|---|
| committer | rautenberg <rautenberg@in-silico.ch> | 2012-07-13 09:45:46 +0200 |
| commit | ca2903692658ca7badcda425153ed12eb19a2ced (patch) | |
| tree | c921872907dd6ce0edaea7c6251c804bc11373f0 /lib/validation.rb | |
| parent | 6e016d24bf6d0272d235c466e0dab3f196f0c0d4 (diff) | |
| parent | 20ea5f9b62966eecb283033b04f6aea98b23d1f8 (diff) | |
Merge branch 'release/v3.2.0'v4.0.0
Diffstat (limited to 'lib/validation.rb')
| -rw-r--r-- | lib/validation.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/validation.rb b/lib/validation.rb index 85004c7..a373e56 100644 --- a/lib/validation.rb +++ b/lib/validation.rb @@ -19,8 +19,9 @@ module OpenTox def self.list( params={} ) filter_string = "" params.each do |k,v| - filter_string = "?" if filter_string.length==0 - filter_string += k.to_s+"="+v + filter_string += (filter_string.length==0 ? "?" : "&") + v = v.to_s.gsub(/;/, "%3b") if v.to_s =~ /;/ + filter_string += k.to_s+"="+v.to_s end (OpenTox::RestClientWrapper.get(CONFIG[:services]["opentox-validation"]+filter_string).split("\n")) end @@ -156,8 +157,9 @@ module OpenTox def self.list( params={} ) filter_string = "" params.each do |k,v| - filter_string = "?" if filter_string.length==0 - filter_string += k.to_s+"="+v + filter_string += (filter_string.length==0 ? "?" : "&") + v = v.to_s.gsub(/;/, "%3b") if v.to_s =~ /;/ + filter_string += k.to_s+"="+v.to_s end (OpenTox::RestClientWrapper.get(File.join(CONFIG[:services]["opentox-validation"],"crossvalidation")+filter_string).split("\n")) end |