diff options
| author | David Vorgrimmler <vorgrimmlerdavid@gmx.de> | 2012-04-23 15:27:53 +0200 |
|---|---|---|
| committer | David Vorgrimmler <vorgrimmlerdavid@gmx.de> | 2012-04-23 15:27:53 +0200 |
| commit | 1dce489efb0e50c8392e5f28a08ee8339f4d3228 (patch) | |
| tree | 114dd620306ff61f9cf11af9d872837b8ccf0304 | |
| parent | a79fd5b58ec1bebc99fe99effaa6ee5e725789a6 (diff) | |
| parent | 3b2f2033aa1d0936009bf13bc32ef6938834efb6 (diff) | |
Merge branch 'development' of github.com:opentox/opentox-ruby into development
| -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 |