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

Timestamp:

Jul 27, 2008, 7:45:35 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #38, #39, #48

Location:

ruby/trunk/lib/models/rm

Files:

• data_types/text.rb (modified) (1 diff)
• support/identification.rb (modified) (3 diffs)
• support/measurement.rb (moved) (moved from ruby/trunk/lib/models/rm/support/support.rb )

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

@@ -30 +30 @@
           end
           private
-          def match_valid(mach)
-            raise ArgumentError, "match is not valid" if self.is_valid_mach_code? match
+          def match_valid(match)
+            raise ArgumentError, "match is not valid" if !Term_Mapping.is_valid_mach_code? match
           end
           def purpose_valid(purpose)
-            if !purpose.nil? and !purpose.instance_of? DV_Coded_Text
+            if purpose.nil? or !purpose.instance_of? DV_Coded_Text
               raise ArgumentError, "purpose is not valid"
             end

ruby/trunk/lib/models/rm/support/identification.rb

@@ +1 @@
+# This module is an implementation of this UML:
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109331021343_528780_2066Report.html
+# Ticket refs #39
 module OpenEHR
   module RM
@@ -4 +7 @@
       module Identification
 
-        class OBJECT_ID
-          attr_accessor :value
+        class Object_ID
+          attr_reader :value
 
-          def initiallize(value)
-            raise "empty value" unless value
-            @value = value
+          def initialize(value)
+            self.value=value
+          end
+
+          def value=(value)
+            raise "empty value" if value.nil? or value.empty?
+            @value = value            
           end
         end # of ObjectID
-
-        class ARCHETYPE_ID < OBJECT_ID
+        
+        class Archetype_ID < Object_ID
         end
 
-        class TERMINOLOGY_ID < OBJECT_ID
+        class Terminology_ID < Object_ID
           attr_reader :name
 
           def initialize(name , version_id)
             @name , @version_id = name , version_id
-#             if arg1 == nil
-#               super(arg0)
-#             else
-#               super(toValue(arg0, arg1))
-#               @name = arg0
-#               @version = arg1      
-#             end
           end
 
@@ -57 +57 @@
             name + (version == nil ? "" : "(" + version + ")")
           end
-        end # of TerminologyID
+        end # of Terminology_ID
       end # of Definition
     end # of Support