Changeset 121 for ruby/trunk/lib/models/assumed_library_types.rb

Timestamp:

May 4, 2009, 9:43:50 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #36

File:

• ruby/trunk/lib/models/assumed_library_types.rb (modified) (4 diffs)

ruby/trunk/lib/models/assumed_library_types.rb

@@ -2 +2 @@
 require 'date'
 require 'time'
-require 'parsedate'
 
 module OpenEHR
@@ -325 +324 @@
       include ISO8601_DATE_MODULE, ISO8601_TIME_MODULE
       def initialize(string)
-        /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d))?)?(Z|([+-]\d{2}):(\d{2}))?)?)?)?/ =~ string
+        /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(Z|([+-]\d{2}):?(\d{2}))?)?)?)?/ =~ string
         if $1.empty?
           raise ArgumentError, 'format invalid'
@@ -356 +355 @@
           self.hour = $4.to_i
         end
-        if $7.nil?
+        if $7.nil? or $7.empty?
           self.fractional_second = nil
         else
@@ -364 +363 @@
           self.timezone = nil
         else
-          self.timezone = $8+$9+$10
+          self.timezone = $9+$10
         end
       end