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

Timestamp:

Sep 21, 2008, 3:53:25 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #65

Location:

ruby/trunk/lib/models/rm

Files:

• common/archetyped.rb (modified) (2 diffs)
• data_types/uri.rb (modified) (3 diffs)

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

@@ -81 +81 @@
           end
         end
+
         class Archetyped
           attr_reader :archetype_id, :rm_version
@@ -98 +99 @@
           end
         end
+        class Link
+          attr_reader :meaning, :target, :type
+          def initialize(meaning, target, type)
+            self.meaning = meaning
+            self.target = target
+            self.type = type
+          end
+          def meaning=(meaning)
+            raise ArgumentError, "meaning should not be nil" if meaning.nil?
+            @meaning = meaning
+          end
+          def target=(target)
+            raise ArgumentError, "target should not be nil" if target.nil?
+            @target = target
+          end
+          def type=(type)
+            raise ArgumentError, "type should not be nil" if type.nil?
+            @type = type
+
+          end
+        end
       end # end of Archetyped
     end # end of Common

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

@@ -25 +25 @@
         class DV_URI < OpenEHR::RM::Data_Types::Basic::Data_Value
           def initialize(value)
-            raise ArgumentError, "value is empty" if value.nil?
-            parse(value)
+            self.value = value
           end
           def fragment_id
@@ -41 +40 @@
           end
           def value=(value)
+            raise ArgumentError, "value is empty" if value.nil?
             parse(value)
           end
@@ -53 +53 @@
         class DV_EHR_URI < DV_URI
           def initialize(value)
-            check_value(value)
             super(value)
           end
           def value=(value)
-            check_value(value)
+            raise ArgumentError, "scheme must be ehr" if !(value =~ /^ehr/i)
             parse(value)
-          end
-          private
-          def check_value(value)
-            if !(value =~ /^ehr/i)
-              raise ArgumentError, "scheme must be ehr"
-            end
           end
         end # of DV_EHR_URI