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

Timestamp:

Oct 12, 2008, 3:39:11 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #39, #48

Location:

ruby/trunk/lib/models/rm

Files:

• data_types/text.rb (modified) (1 diff)
• support/identification.rb (modified) (2 diffs)

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

@@ -46 +46 @@
         class Code_Phrase
           attr_reader :terminology_id, :code_string
-          def initialize(terminology_id, code_string)
+          def initialize(code_string, terminology_id)
+            self.code_string = code_string
             self.terminology_id = terminology_id
-            self.code_string = code_string
           end
 

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

@@ -94 +94 @@
           attr_reader :name, :version_id
 
-          def initialize(value, name , version_id="")
-            self.value = value
+          def initialize(name, version_id="")
             self.name = name
             self.version_id = version_id
           end
 
-          def value = (value)
+          def value
+            if @version_id.empty?
+              @name
+            else
+              @name + '(' + @version_id + ')'
+            end 
+          end
+
+
+          def value=(value)
             raise ArgumentError, "value not valid" if value.nil? or value.empty?
-            if /(.*)(\(.*\)$)/ = value
+            if /(.*)\((.*)\)$/ =~ value
               @name = $1
               @version_id = $2
@@ -114 +122 @@
             raise ArgumentError, "name not valid" if name.nil? or name.empty?
             @name = name
-            if @version_id.empty?
-              @value = name
-            else
-              @value = name + '(' + value ')'
-            end 
           end