Changes in ruby/trunk/models/am/archetype/archetype.rb [26:4]

File:

• ruby/trunk/models/am/archetype/archetype.rb (modified) (2 diffs)

ruby/trunk/models/am/archetype/archetype.rb

@@ -7 +7 @@
 #        include OpenEHR::RM::Support::Terminology::OpenEHR_Code_Set_Identifier
         include OpenEHR::RM::Support::Terminology
-        CURRENT_ADL_VERSION = "1.4"
+        CURRENT_ADL_VERSION = "2.0"
       end
-
-      class ARCHETYPE < OpenEHR::RM::Common::Resource::AUTHORED_RESOURCE
+      class Archetype < OpenEHR::RM::Common::Resource::Authored_Resource
         include ADL_Definition
         attr_accessor :archetype_id, :concept_code, :is_controlled, :original_language, :parent_archtype_id, :uid
 
-        attr_reader :parent_id,:concept, :definition, :ontology
-        attr_accessor :adl_version,:description,:original_language
+        attr_reader :adl_version, :id, :parent_id
+        attr_reader :concept, :definition, :ontology
+        attr_accessor :description,:original_language
         attr_accessor :revision_history, :translation
 
-        def initialize(args = {})
-          @adl_version = args[:adl_version] if args[:adl_version]
-          @archetype_id = args[:archetype_id] ? args[:archetype_id] : nil
-          @parent_id = args[:parent_id] if args[:parent_id]
-          @concept = args[:concept] if args[:concept]
-          @is_controled = args[:is_controled] if args[:is_controled]
-          @definition = args[:definition] if args[:definition]
-          @ontology = args[:ontology] if args[:ontology]
+        def initialize(parent_id, concept,
+                       description, revision_history, is_controled,
+                       definition, ontology, adl_version,
+                       id = nil , original_language = nil, translation = nil)
+#          raise Exception.new("illegal argument error, id == nil") unless id
+#          raise Exception.new("illegal argument error, originalLanguage == nil") unless origina_language
+
+#          raise Exception.new("illegal argument error, translation == nil") unless translation
+          @adl_version = adl_version
+          @id = id
+          @parent_id = parent_id
+          @concept = concept
+          @original_language = original_language
+          @translation = translation
+          @description = description
+          @revision_history = revision_history
+          @is_controled = is_controled
+          @definition = definition
+          @ontology = ontology
  #         loadMaps(definition)
-          super
-        end
-
-        def self.create(args ={}, &block)
-          archetype = new(args)
-          if block_given?
-            yield archetype
-          end
-          return archetype
         end
 
@@ -73 +75 @@
         def version
         end
-      end # end of ARCHETYPE
+      end
       # original file:
       # ref_imple_eiffel/components/adl_parser/src/interface/adl_definition.e
-
-      class VALIDITY_KIND
-      end
-    end
-
-
+    end # end of Archetype
   end # end of AM
 end # end of OpenEHR