diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2012-04-23 11:17:49 +0200 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2012-04-23 11:17:49 +0200 |
| commit | 6927ecb8780ab2b969ecde71972e6c3c40e9d16f (patch) | |
| tree | 29e222a05a8528bf5a0124d0a5ff92f9ec9188e5 | |
| parent | d809fed6b67cf3d9c66b7d23de9392de9801c3b0 (diff) | |
enable validation list filtering for multiple arguments
| -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 |