Changeset 83 for ruby/trunk

Timestamp:

Jul 20, 2008, 8:19:06 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #36
almost all fixed ISO8601_TIME

Location:

ruby/trunk/lib/models

Files:

• assumed_library_types.rb (modified) (4 diffs)
• rm/common/generic.rb (modified) (1 diff)

ruby/trunk/lib/models/assumed_library_types.rb

@@ +1 @@
+# This module is related to the ticket #36
 require 'date'
 require 'time'
@@ -88 +89 @@
       end
 
-      def self.valid_hour?(h,m,s)
-        valid_minute?(m) and valid_second?(s) and ((h >= 0 and h < HOURS_IN_DAY) or (h == HOURS_IN_DAY and m == 0 and s == 0))
+      def self.valid_hour?(h,m = nil, s = nil)
+        if !m.nil? and !valid_minute?(m)
+          return false
+        end
+        if !s.nil? and (!m.nil? and !valid_second?(s))
+          return false
+        end
+        (h >= 0 and h < HOURS_IN_DAY) or (h == HOURS_IN_DAY and m == 0 and s == 0)
       end
       def self.valid_minute?(mi)
@@ -161 +168 @@
 
     class ISO8601_TIME < TIME_DEFINITIONS
-      attr_reader :hh, :mm, :ss, :msec, :tz
-      def initialize(hh = nil, mm = nil, ss = nil, msec = nil, tz = nil)
-        
+      attr_reader :hour, :minute, :second, :fractional_second, :timezone
+      def initialize(hh, mm = nil, ss = nil, msec = nil, tz = nil)
+        raise ArgumentError, "Not valid hour format" if !ISO8601_TIME.valid_hour?(hh,mm,ss)
+        @hour = hh; @minute = mm; @second = ss
+        @fractional_second = msec; @timezone = tz
+      end
+      def hour=(hour)
+        raise ArgumentError, "hour is not valid" if !ISO8601_TIME.valid_hour?(hour, @minute, @second)
+        @hour = hour
+      end
+      def minute_unknown?
+        @minute.nil?
+      end
+      def minute=(minute)
+        raise ArgumentError, "minute is not valid" if !minute.nil? and !ISO8601_TIME.valid_minute?(minute)
+        @minute = minute
+      end
+      def second_unknown?
+        @second.nil?
+      end
+      def second=(second)
+        raise ArgumentError, "minute not defined" if @minute.nil?
+        raise ArgumentError, "second is not valid" if !second.nil? and !ISO8601_TIME.valid_second?(second)
+        @second = second
+      end
+      def fractional_second=(fractional_second)
+        raise ArgumentError, "minute not defined" if minute_unknown?
+        raise ArgumentError, "second not defined" if second_unknown?
+        raise ArgumentError, "fractional second should be lower than 1.0" if fractional_second >= 1.0
+        @fractional_second = fractional_second
+      end
+      def has_fractional_second?
+        if @fractional_second.nil?
+          return false
+        else
+          return true
+        end
+      end
+      def is_decimal_sign_comma?
+        true
+      end
+      def is_extended?
+        true
+      end
+      def is_partial?
+        second_unknown? or minute_unknown?
       end
       def as_string
-        s = @hh
-        if !@mm.nil?
-          s += ":" + @mm
-          if !@ss.nil?
-            s += ":" + @ss
-            if !@msec.nil?
-              s += "," + @msec
-              if !@tz.nil?
-                s += @tz
+        s = sprintf("%02d", @hour)
+        if !@minute.nil?
+          s += ":" + sprintf("%02d",@minute)
+          if !@second.nil?
+            s += ":" + sprintf("%02d", @second)
+            if !@fractional_second.nil?
+              s += "," + @fractional_second.to_s[2..-1]
+              if !@timezone.nil?
+                s += @timezone
               end
             end
@@ -187 +237 @@
 # (\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d))?)?(Z|([+-]\d{2}):(\d{2}))?)?)?)?
           hh = $1; mm = $2; ss = $4; msec = $7; tz = $8
-          if hh.to_i == HOURS_IN_DAY and (mm.nil? or mm.to_i == "00") and (ss.nil? or ss.to_i == "00")
+          if hh.to_i == HOURS_IN_DAY and (mm.nil? or mm.to_i == 0) and (ss.nil? or ss.to_i == 0) and (msec.nil? or msec.to_i==0)
             return true
           end

ruby/trunk/lib/models/rm/common/generic.rb

@@ +1 @@
+# This module is a implementation of the bellow UML
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140169202660_257304_813Report.html
+# Related to the ticket #62
 module OpenEHR
   module RM