Changeset 267

Timestamp:

Sep 15, 2009, 10:21:45 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

bugs fixed around identification

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/support/identification.rb (modified) (4 diffs)
• spec/lib/open_ehr/rm/support/identification/archetype_id_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/support/identification/terminology_id_spec.rb (added)

ruby/branches/0.5/lib/open_ehr/rm/support/identification.rb

@@ -91 +91 @@
 
           def value
-            return self.qualified_rm_entity + self.domain_concept + '.' + @version_id
+            return self.qualified_rm_entity + '.' +
+              self.domain_concept + '.' + @version_id
           end
 
@@ -149 +150 @@
 
           def initialize(args = {})
-            super(args)
+            if args[:value].nil?
+              self.name = args[:name]
+              self.version_id = args[:version_id]
+            else
+              super(args)
+            end
           end
 
@@ -163 +169 @@
           def value=(value)
             raise ArgumentError, "value not valid" if value.nil? or value.empty?
-            if /(.*)\((.*)\)$/ =~ value
-              @name = $1
-              @version_id = $2
-            else
-              @name = value
-              @version_id = ''
-            end
-            @value = value
+            if /(.*)\((.*)\)/ =~ value
+              self.name = $1
+              self.version_id = $2
+            else
+              self.name = value
+              self.version_id = ''
+            end
           end
 
@@ -179 +184 @@
 
           def version_id=(version_id)
-            raise ArgumentError, "version_id not valid" if version_id.nil?
-            @version_id = version_id
+            if version_id.nil?
+              @version_id = ''
+            else
+              @version_id = version_id
+            end
           end
         end # of Terminology_ID

ruby/branches/0.5/spec/lib/open_ehr/rm/support/identification/archetype_id_spec.rb

@@ -11 +11 @@
   end
 
+  it 's value should be equal
+       openEHR-EHR-SECTION.physical_examination-prenatal.v2' do
+    @archetype_id.value.should ==
+      'openEHR-EHR-SECTION.physical_examination-prenatal.v2'
+  end
   it 's qualified_rm_entity should be openEHR-EHR-SECTION' do
     @archetype_id.qualified_rm_entity.should == 'openEHR-EHR-SECTION'