Changeset 153 for ruby/trunk/lib/models/rm

Timestamp:

Jul 3, 2009, 2:17:43 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #62, #47, #65

Location:

ruby/trunk/lib/models/rm

Files:

• common/archetyped.rb (modified) (1 diff)
• common/generic.rb (modified) (3 diffs)
• data_types/time_specification.rb (modified) (2 diffs)

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

@@ -138 +138 @@
 
         class Feeder_Audit_Details
+          attr_reader :system_id
 
+          def initialize(args ={ })
+            self.system_id = args[:system_id]
+          end
+
+          def system_id=(system_id)
+            raise ArgumentError, 'system_id invalid' if system_id.nil? or system_id.empty?
+            @system_id = system_id
+          end
         end # of Feeder_Audit_Details
       end # of Archetyped

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

@@ -2 +2 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140169202660_257304_813Report.html
 # Related to the ticket #62
+include OpenEHR::RM::Support::Identification
+include OpenEHR::RM::Data_Types::Basic
 module OpenEHR
   module RM
@@ -17 +19 @@
 
         class Party_Proxy
-          def external_ref
-            Raise NotImplementedError, 'external_ref shoud provide Party_Ref'
+          attr_accessor :external_ref
+
+          def initialize(args = { })
+            self.external_ref = args[:external_ref]
           end
         end
@@ -27 +31 @@
 
         class Party_Identified < Party_Proxy
+          attr_reader :name, :identifier
+          def initialize(args = { })
+            if args[:external_ref].nil? && args[:name].nil? &&
+                args[:identifier].nil?
+              raise ArgumentError, 'cannot identified'
+            end
+            super(:external_ref => args[:external_ref])
+            self.name = args[:name]
+            self.identifier = args[:identifier]
+          end
 
+          def name=(name)
+            if name.nil? && @external_ref.nil? && @identifier.nil?
+              raise ArgumentError, 'cannot identified'
+            end
+            raise ArgumentError, 'invaild name' unless name.nil? || !name.empty?
+            @name = name
+          end
+
+          def identifier=(identifier)
+            if @name.nil? && @external_ref.nil? && identifier.nil?
+              raise ArgumentError, 'cannot identified'
+            end
+            unless identifier.nil? || !identifier.empty?
+              raise ArgumentError, 'invaild identifier'
+            end
+            @identifier = identifier
+          end
         end
 

ruby/trunk/lib/models/rm/data_types/time_specification.rb

@@ -30 +30 @@
         end
 
+# I have not implemented two classes bellow,
+# because I could not obtain HL7 specification related them.
+
 
         class DV_General_Time_Specification < DV_Time_Specification
@@ -55 +58 @@
               raise ArgumentError, "value is not valid"
             end
-            /^\[(\d+)\;?(\d+)?\]\/\((\d+\w+)\)(@(\w+?))?(IST)?$/ =~ value
-            interval1, interval2, difference, allignment = $1, $2, $3, $5
-# not implemented because of unknown HL7 specification
-
-          end
-
-          def calender_alignment
-
-          end
-
-          def event_alignment
-
+            if value.formalism('HL7:PIVL')
+              /^\[(\d+)\;?(\d+)?\]\/\((\d+\w+)\)(@(\w+?))?(IST)?$/ =~ value
+              interval1, interval2, difference, allignment = $1, $2, $3, $5
+            end
+            if value
+            end
           end
 
           def institution_specified?
 
-          end
-          def period
           end
         end