diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2012-01-05 14:23:01 +0100 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2012-01-05 14:23:01 +0100 |
| commit | 26e7338a1f5b8aac257de20e70c48e8144ef0720 (patch) | |
| tree | 8e8a4771f8e703f11291b71a2a476e7110f0436c | |
| parent | 4a4b743704b819dec39c672d9550038f45484160 (diff) | |
fix: make sure subjectid is set in merged validation for comparison report
| -rwxr-xr-x | report/validation_data.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/report/validation_data.rb b/report/validation_data.rb index e91348d..eea5229 100755 --- a/report/validation_data.rb +++ b/report/validation_data.rb @@ -86,8 +86,8 @@ module Reports VAL_ATTR_RANKING.collect{ |a| (a.to_s+"_ranking").to_sym } @@validation_attributes.each{ |a| attr_accessor a } - attr_reader :predictions, :subjectid, :filter_params - attr_accessor :identifier, :validation_report_uri, :crossvalidation_report_uri + attr_reader :predictions, :filter_params + attr_accessor :identifier, :validation_report_uri, :crossvalidation_report_uri, :subjectid def initialize(uri = nil, filter_params=nil, subjectid = nil) Reports.validation_access.init_validation(self, uri, filter_params, subjectid) if uri @@ -456,7 +456,8 @@ module Reports #merge Lib::MergeObjects.register_merge_attributes( ReportValidation, - Validation::VAL_MERGE_AVG+Validation::VAL_MERGE_SUM,[],Validation::VAL_MERGE_GENERAL+[:identifier, :validation_report_uri, :crossvalidation_report_uri]) unless + Validation::VAL_MERGE_AVG+Validation::VAL_MERGE_SUM,[], + Validation::VAL_MERGE_GENERAL+[:identifier, :validation_report_uri, :crossvalidation_report_uri, :subjectid]) unless Lib::MergeObjects.merge_attributes_registered?(ReportValidation) grouping.each do |g| new_set.validations << g[0].clone_validation |