Changeset 322 for ruby/branches/0.5/lib/open_ehr/rm/common/generic.rb

Timestamp:

Oct 18, 2009, 8:14:21 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

common/generic near completed

File:

• ruby/branches/0.5/lib/open_ehr/rm/common/generic.rb (modified) (2 diffs)

ruby/branches/0.5/lib/open_ehr/rm/common/generic.rb

@@ -109 +109 @@
               raise ArgumentError, 'cannot identified'
             end
-            super(:external_ref => args[:external_ref])
             self.name = args[:name]
             self.identifier = args[:identifier]
+            super(args)
           end
 
@@ -126 +126 @@
               raise ArgumentError, 'cannot identified'
             end
-            unless identifier.nil? || !identifier.empty?
+            if !identifier.nil? && identifier.empty?
               raise ArgumentError, 'invaild identifier'
             end
             @identifier = identifier
+          end
+
+          def external_ref=(external_ref)
+            if @name.nil? && @identifier.nil? && external_ref.nil?
+              raise ArgumentError, 'invalid external_ref'
+            end
+            @external_ref = external_ref
           end
         end