Changeset 398 for ruby/trunk

Timestamp:

Jan 21, 2010, 6:54:57 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #71

Location:

ruby/trunk

Files:

• lib/open_ehr/am/archetype/constraint_model/primitive.rb (modified) (1 diff)
• lib/open_ehr/assumed_library_types.rb (modified) (6 diffs)
• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (1 diff)
• spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_time_spec.rb (added)

ruby/trunk/lib/open_ehr/am/archetype/constraint_model/primitive.rb

@@ -173 +173 @@
             end
           end
+
+          class CTime < CPrimitive
+
+          end
         end # of Primitive
       end # of CostraintModel

ruby/trunk/lib/open_ehr/assumed_library_types.rb

@@ -135 +135 @@
 
     module ISO8601DateModule
-      include Comparable
       attr_reader :year, :month, :day
 
@@ -182 +181 @@
       end
       
-      def <=>(other)
-        (@year*TimeDefinitions::NOMINAL_DAYS_IN_YEAR +
-         @month*TimeDefinitions::NOMINAL_DAYS_IN_MONTH + @day) <=>
-          (other.year*TimeDefinitions::NOMINAL_DAYS_IN_YEAR +
-           other.month*TimeDefinitions::NOMINAL_DAYS_IN_MONTH + other.month)
-      end
       protected
       def leapyear?(year)
@@ -198 +191 @@
     end
 
+    def nilthenzero(value)
+      return value ? value : 0
+    end
+
     class ISO8601Date < TimeDefinitions
-      include ISO8601DateModule
+      include ISO8601DateModule, Comparable
       def initialize(string)
         /(\d{4})(?:-(\d{2})(?:-(\d{2})?)?)?/ =~ string
@@ -217 +214 @@
           self.day = $3.to_i
         end
+      end
+
+      def <=>(other)
+        magnitude =
+          nilthenzero(@year)*TimeDefinitions::NOMINAL_DAYS_IN_YEAR +
+          nilthenzero(@month)*TimeDefinitions::NOMINAL_DAYS_IN_MONTH +
+          nilthenzero(@day)
+        other_magnitude =
+          nilthenzero(other.year)*TimeDefinitions::NOMINAL_DAYS_IN_YEAR +
+          nilthenzero(other.month)*TimeDefinitions::NOMINAL_DAYS_IN_MONTH +
+          nilthenzero(other.day)
+        magnitude <=> other_magnitude
       end
 
@@ -312 +321 @@
         return s
       end
+
+      
     end
 
     class ISO8601Time < TimeDefinitions
-      include ISO8601TimeModule
+      include ISO8601TimeModule, Comparable
       def initialize(string)
         /(\d{2}):?(\d{2})?(:?)(\d{2})?((\.|,)(\d+))?(Z|([+-](\d{2}):?(\d{2})))?/ =~ string
@@ -343 +354 @@
           self.timezone = $8
         end
+      end
+
+      def <=>(other)
+        magnitude = (nilthenzero(@hour)*60 + nilthenzero(@minute))*60 +
+          nilthenzero(@second) +
+          nilthenzero(@fractional_second)
+        other_magnitude = (nilthenzero(other.hour) * 60 +
+                           nilthenzero(other.minute)) * 60 +
+          nilthenzero(other.second) +
+          nilthenzero(other.fractional_second)
+        magnitude <=> other_magnitude
       end
 

ruby/trunk/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -181 +181 @@
             end
 
-            def <=>(other)
-              self.magnitude <=> other.magnitude
-            end
-
             private
-
             def split_date_time(date_time)
               /^(.*)T(.*)$/ =~ date_time.as_string