Changeset 342 for ruby

Timestamp:

Nov 12, 2009, 12:01:35 AM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

ref #55, fixed #54

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_structures/history.rb (added)
• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (4 diffs)
• spec/lib/open_ehr/rm/data_structures/history (added)
• spec/lib/open_ehr/rm/data_structures/history/history_spec.rb (added)
• spec/lib/open_ehr/rm/data_structures/item_structure/representation/cluster_spec.rb (added)
• spec/lib/open_ehr/rm/data_structures/item_structure/representation/element_spec.rb (added)

ruby/branches/0.5/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -81 +81 @@
               end
               year += future.year - past.year
-              return DvDuration.new(
+              return DvDuration.new(:value =>
                    'P' + year.to_s + 'Y' + month.to_s + 'M' + 
                          week.to_s + 'W' + day.to_s + 'D')
@@ -109 +109 @@
               second = (diff - hour * 60 *60 - minute * 60).to_i
               fractional_second = ((diff - diff.to_i)*1000000.0).to_i/1000000.0
-              return DvDuration.new('P0Y0M0W0DT' + hour.to_s + 'H' +
+              return DvDuration.new(:value =>
+                        'P0Y0M0W0DT' + hour.to_s + 'H' +
                         minute.to_s + 'M' +
                         second.to_s + fractional_second.to_s[1..-1] + 'S')
@@ -162 +163 @@
               fractional_second = 
                 ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
-              return DvDuration.new(date_duration.value + 'T' +
+              return DvDuration.new(:value => 
+                        date_duration.value + 'T' +
                         hour.to_s + 'H' +
                         minute.to_s + 'M' +
@@ -180 +182 @@
             attr_reader :value
             
-            def initialize(value, magnitude_status=nil, accuracy=nil,
-                         accuracy_percent=nil, normal_range=nil,
-                         normal_status = nil, other_reference_ranges=nil)
-              self.value = value
+            def initialize(args = { })
+              self.value = args[:value]
+              self.magnitude_status = args[:magnitude_status]
+              self.normal_range = args[:normal_range]
+              self.normal_status = args[:normal_status]
+              self.other_reference_ranges = args[:other_reference_ranges]
             end