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

Timestamp:

Oct 18, 2009, 8:14:21 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

common/generic near completed

File:

• ruby/branches/0.5/lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (7 diffs)

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

@@ -29 +29 @@
               @value = value
             end
+
+            undef magnitude=
           end
 
@@ -43 +45 @@
               @day = iso8601_date.day
             end
-
-            undef magnitude=
 
             def magnitude
@@ -89 +89 @@
           
           class DvTime < DvTemporal
-            include OpenEHR::AssumedLibraryTypes::ISO8601TimeModule
-            def initialize(value, magnitude_status=nil, accuracy=nil,
-                           normal_range=nil, normal_status=nil,
-                           other_reference_range=nil)
-              super(value, magnitude_status, accuracy, normal_range,
-                    normal_status, other_reference_range)
-            end
+            include ISO8601TimeModule
 
             def value=(value)
               super(value)
-              iso8601_time = AssumedLibraryTypes::ISO8601Time.new(value)
+              iso8601_time = ISO8601Time.new(value)
               @hour = iso8601_time.hour
               @minute = iso8601_time.minute
@@ -124 +118 @@
           class DvDateTime < DvTemporal
             include OpenEHR::AssumedLibraryTypes::ISO8601DateTimeModule
-            attr_reader :value
-
-            def initialize(value, magnitude_status=nil, accuracy=nil,
-                           normal_range=nil, normal_status=nil,
-                           other_reference_range=nil)
-              super(value, magnitude_status, accuracy, normal_range,
-                    normal_status, other_reference_range)
-            end
 
             def value=(value)              
@@ -147 +133 @@
 
             def magnitude
-              seconds = ::DateTime.new(@year,@month,@day,@hour,@minute,@second) - 
-                ::DateTime.new(0000,1,1,0,0,0)
+              seconds = (((@year * 365.24 +
+                           @month * 30.42 +
+                           @day) * 24 + @hour) * 60 +
+                         @minute) * 60 + @second
               if @fractional_second.nil?
                 return seconds
@@ -155 +143 @@
               end
             end
-
-            undef magnitude=
 
             def diff(other)
@@ -175 +161 @@
               minute = ((time_diff - hour*60*60)/60).to_i
               second = (time_diff - hour * 60 *60 - minute * 60).to_i
-              fractional_second = ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
-
+              fractional_second = 
+                ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
               return DvDuration.new(date_duration.value + 'T' +
                         hour.to_s + 'H' +
                         minute.to_s + 'M' +
                         second.to_s + fractional_second.to_s[1..-1] + 'S')
-                                   
             end