diff options
author | Martin Gütlein <martin.guetlein@gmail.com> | 2009-11-18 15:00:50 +0100 |
---|---|---|
committer | Martin Gütlein <martin.guetlein@gmail.com> | 2009-11-18 15:00:50 +0100 |
commit | 199a350dfda66a918bd52b59e7f511a9cc19fd63 (patch) | |
tree | 39989b9dc8b9d4a2d7d73d67ce0288eb4ab0ed39 /report/validation_access.rb | |
parent | 96c65cc14d904ecb32b563a12bd3fea48173ec02 (diff) |
validation props are now symbols instead of strings, minor changes
Diffstat (limited to 'report/validation_access.rb')
-rw-r--r-- | report/validation_access.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/report/validation_access.rb b/report/validation_access.rb index b89599c..5f04472 100644 --- a/report/validation_access.rb +++ b/report/validation_access.rb @@ -49,7 +49,7 @@ class Reports::ValidationDB < Reports::ValidationAccess raise Reports::BadRequest.new "no validation found with id "+validation_id.to_s unless v (OpenTox::Validation::VAL_PROPS + OpenTox::Validation::VAL_CV_PROPS).each do |p| - validation.send("#{p.to_s}=".to_sym, v.send("#{p.to_s}")) + validation.send("#{p.to_s}=".to_sym, v[p]) end {OpenTox::Validation::VAL_CLASS_PROP => OpenTox::Validation::VAL_CLASS_PROPS}.each do |subset_name,subset_props| @@ -64,7 +64,7 @@ class Reports::ValidationDB < Reports::ValidationAccess raise Reports::BadRequest.new "no crossvalidation found with id "+validation.crossvalidation_id.to_s unless cv OpenTox::Validation::CROSS_VAL_PROPS.each do |p| - validation.send("#{p.to_s}=".to_sym, cv["#{p.to_s}".to_sym]) + validation.send("#{p.to_s}=".to_sym, cv[p]) end end @@ -104,13 +104,13 @@ class Reports::ValidationWebservice < Reports::ValidationAccess end OpenTox::Validation::VAL_PROPS.each do |p| - validation.send("#{p.to_s}=".to_sym, data[p]) + validation.send("#{p}=".to_sym, data[p]) end {OpenTox::Validation::VAL_CV_PROP => OpenTox::Validation::VAL_CV_PROPS, OpenTox::Validation::VAL_CLASS_PROP => OpenTox::Validation::VAL_CLASS_PROPS}.each do |subset_name,subset_props| subset = data[subset_name] - subset_props.each{ |prop| validation.send("#{prop.to_s}=".to_sym, subset[prop]) } if subset + subset_props.each{ |prop| validation.send("#{prop}=".to_sym, subset[prop]) } if subset end end @@ -126,7 +126,7 @@ class Reports::ValidationWebservice < Reports::ValidationAccess end OpenTox::Validation::CROSS_VAL_PROPS.each do |p| - validation.send("#{p.to_s}=".to_sym, data["#{p.to_s}".to_sym]) + validation.send("#{p.to_s}=".to_sym, data[p]) end end |