Changeset 287 for ruby/branches

Timestamp:

Sep 23, 2009, 3:45:32 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

iso8601 date time completed

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/assumed_library_types.rb (modified) (2 diffs)
• spec/lib/open_ehr/assumed_library_types/iso8601_date_time_spec.rb (added)

ruby/branches/0.5/lib/open_ehr/assumed_library_types.rb

@@ -339 +339 @@
 
       def self.valid_iso8601_time?(s)
-        if /^(\d{2}):?(\d{2})?(:?)(\d{2})?((\.|,)(\d+))?(T?)(Z|([+-](\d{2}):?(\d{2})))?$/ =~ s
+        if /^(\d{2}):?(\d{2})?(:?)(\d{2})?((\.|,)(\d+))?(Z|([+-](\d{2}):?(\d{2})))?$/ =~ s
 # ISO 8601 regular expression by H. Yuki
 #  http://digit.que.ne.jp/work/wiki.cgi?Perl%E3%83%A1%E3%83%A2%2FW3C%E5%BD%A2%E5%BC%8F%E3%81%AE%E6%97%A5%E6%99%82%E3%81%AE%E8%A7%A3%E6%9E%90
 # (\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 = $9
+          hh = $1; mm = $2; ss = $4; msec = $7; tz = $8
           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
@@ -410 +410 @@
       include ISO8601DateTimeModule
       def initialize(string)
-        /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(Z|([+-]\d{2}):?(\d{2}))?)?)?)?/ =~ string
-        if $1.empty?
+        unless /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(Z|([+-]\d{2}):?(\d{2}))?)?)?)?/ =~ string
           raise ArgumentError, 'format invalid'
         else