openehr 1.2.16 → 1.2.999999

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 809f7e0499dba61d1d2997ab207c65cb4c505468
-  data.tar.gz: b7d046f29a8fd2ebff8bb738621f291ef3d2c1d6
+SHA256:
+  metadata.gz: 0b1262bf46aa8257e7bb3aded5078ca794a14febe4b60f258ad515f7b63fb372
+  data.tar.gz: 073635b1014bb231c543566532b6327b9e2c211a95eb0d8f85502e03530b5107
 SHA512:
-  metadata.gz: db24ac16e6bdf90fc67480ae6bbb5e1e62d77ae22ffa4b8dfb397b16389cdb35d30a3855e26e629cad6a4c8c91ac8334b4ed1126c8d5ed12ebbdea0aa45ffc91
-  data.tar.gz: 7f8a0cc6cee140e9edebf24a4bb45e5928752dd53835a26a9dad5a4cab642a297947f6498137bfa6913a3343414507d578d3c62922f77f1964680bea5c5ceb5c
+  metadata.gz: cd81e9d640e206637b9cc742294f079627699eb9d93abf243efc9e93141c16db987c5d5ebb7068a5f87cb56f378268ab5606f183646b98e6374f89f5f128e541
+  data.tar.gz: 3505875a5655d03b0657521dae3c657c33db22c0d61db91be7d559de6106d2f24429daa1b1ec9a54292e2d10922ec9d393052e5d5ff7bfcf8bf77d490ac99396

data/README.rdoc

@@ -7,9 +7,9 @@ A Ruby implementation of the openEHR specifications
 
 = Requirements
 
-* Supports Ruby 1.9.3, 2.0.0, 2.1.0 or equivalents.
-* Developed with CRuby 2.1.0, 2.0.0, 1.9.3 on FreeBSD and Linux.
-* Ruby 1.8 or earlier are no longer supported.
+* Supports CRuby 2.3.6, 2.4.3, 2.5.0  or equivalents.
+* Developed with CRuby 2.5.0 on FreeBSD and Linux.
+* Ruby 2.2 or earlier are no longer supported.
 
 =Description
 
@@ -66,7 +66,7 @@ All Rights Reserved.
 
 This product is released under Apache 2.0 license
 
-   Copyright [2012,2013] openEHR Ruby implementation project.
+   Copyright [2012-2018] openEHR Ruby implementation project.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/lib/openehr/am.rb

@@ -3,8 +3,11 @@ require_relative 'am/archetype'
 require_relative 'am/archetype/assertion'
 require_relative 'am/archetype/constraint_model'
 require_relative 'am/archetype/constraint_model/primitive'
+# Archetype ontology module was renamed to terminology module
+require_relative 'am/archetype/terminology'
 require_relative 'am/archetype/ontology'
 
+
 #openEHR Archetype Profile
 require_relative 'am/openehr_profile/data_types/basic'
 require_relative 'am/openehr_profile/data_types/text'

data/lib/openehr/am/archetype.rb

@@ -100,6 +100,12 @@ module OpenEHR
           return archetype
         end
 
+        def to_rm
+          ::OpenEHR::RM::Factory.create(definition.rm_type_name,
+                                        archetype_node_id: definition.archetype_node_id,
+                                        name: definition
+                                        )
+        end
       end # end of Archetype
       # original file:
       # ref_imple_eiffel/components/adl_parser/src/interface/adl_definition.e

data/lib/openehr/am/archetype/ontology.rb

@@ -1,6 +1,7 @@
 module OpenEHR
   module AM
     module Archetype
+# Ontology module was renamed to Terminology at spec 1.1.0.
       module Ontology
         class ArchetypeOntology
           attr_accessor :specialisation_depth, :primary_language

data/lib/openehr/am/archetype/terminology.rb

@@ -0,0 +1,15 @@
+require_relative './ontology'
+# Archetype Ontology module was renamed to Terminology at spec 1.1.0
+module OpenEHR
+  module AM
+    module Archetype
+      module Terminology
+        class ArchetypeTerminology < OpenEHR::AM::Archetype::Ontology::ArchetypeOntology
+        end
+
+        class ArchetypeTerm < OpenEHR::AM::Archetype::Ontology::ArchetypeTerm
+        end
+      end
+    end
+  end
+end

data/lib/openehr/am/template.rb

@@ -2,14 +2,20 @@ module OpenEHR
   module AM
     module Template
       class OperationalTemplate
-        attr_reader :concept, :language, :description, :template_id, :definition
+        attr_reader :uid, :concept, :language, :description, :template_id, :definition, :component_terminologies
 
         def initialize(args = {})
+          self.uid = args[:uid]
           self.concept = args[:concept]
           self.template_id = args[:template_id]
           self.language = args[:language]
           self.description = args[:description]
           self.definition = args[:definition]
+          self.component_terminologies = args[:component_terminologies]
+        end
+
+        def uid=(uid)
+          @uid = uid
         end
 
         def concept=(concept)
@@ -35,6 +41,10 @@ module OpenEHR
           raise ArgumentError if definition.nil?
           @definition = definition
         end
+
+        def component_terminologies=(component_terminologies)
+          @component_terminologies = component_terminologies
+        end
       end
     end
   end

data/lib/openehr/assumed_library_types.rb

@@ -30,7 +30,7 @@ module OpenEHR
       end
 
       def lower_included=(lower_included)
-        if (lower == nil) && (lower_included != nil)
+        if (lower.nil?) && (!lower_included.nil?)
           raise ArgumentError, "lower is not set"
         end
         lower_included = true if !lower.nil? && lower_included.nil?

data/lib/openehr/parser/adl_grammar.tt

@@ -25,6 +25,10 @@ module OpenEHR
             arch_identification.adl_version
           end
 
+          def uid
+            arch_identification.uid
+          end
+
 	  def concept
 	    arch_concept.value
 	  end
@@ -61,6 +65,10 @@ module OpenEHR
 	    head.value[:adl_version]
 	  end
 
+          def uid
+            head.value[:uid]
+          end
+
           def is_controlled?
             head.value[:is_controlled?]
           end
@@ -89,11 +97,10 @@ module OpenEHR
       end
 
       rule arch_meta_data_items
-        item:arch_meta_data_item other_item:(';' arch_meta_data_item)* {
+        item:arch_meta_data_item other_items:(';' white_space arch_meta_data_item)* {
           def value
 	    v = item.value
-            other_item.elements.map {|i| i.arch_meta_data_item.value}
-            v
+            other_items.elements.map {|m| m.arch_meta_data_item.value }.inject(v, :update)
 	  end
         }
       end
@@ -104,9 +111,14 @@ module OpenEHR
             {:adl_version => ver.value}
           end
         }
+      / SYM_UID SYM_EQ uid:V_HIER_OBJECT space {
+          def value
+            { :uid => uid.value }
+          end
+        }
       / SYM_IS_CONTROLED space {
           def value
-	    {:is_controled? => true} # if elements[0]
+	    { :is_controled? => true } # If elements[0]
           end
         }
       end
@@ -562,7 +574,7 @@ module OpenEHR
               path = node.path + id.value
             elsif node.id
               path = node.path + "[#{node.id}]/" + id.value
-            elsif
+            else
               path = node.path + '/' + id.value
             end
             OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(
@@ -578,7 +590,7 @@ module OpenEHR
               path = node.path + id.value
             elsif node.id
               path = node.path + "[#{node.id}]/" + id.value
-            elsif
+            else
               path = node.path + '/' + id.value
             end
             OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(
@@ -2133,6 +2145,11 @@ module OpenEHR
             [term_code.value]
           end
         }
+      / SYM_LIST_CONTINUE {
+          def value
+            []
+          end
+        }
       end
 
       rule uri_value
@@ -2875,6 +2892,10 @@ module OpenEHR
         [a-zA-Z0-9]
       end
 
+      rule HEXADECIMAL
+        [a-fA-F0-9]
+      end
+
       rule IDCHAR
         [a-zA-Z0-9_]
       end
@@ -3139,6 +3160,10 @@ module OpenEHR
         [Aa] [Dd] [Ll] '_' [Vv] [Ee] [Rr] [Ss] [Ii] [Oo] [Nn] space
       end
 
+      rule SYM_UID
+        [Uu] [Ii] [Dd] space
+      end
+
       rule SYM_IS_CONTROLLED
         [Cc] [Oo] [Nn] [Tt] [Rr] [Oo] [Ll] [Ll] [Ee] [Dd] space
       end
@@ -3203,6 +3228,14 @@ module OpenEHR
         }
       end
 
+      rule V_HIER_OBJECT
+        HEXADECIMAL 8..8 '-' (HEXADECIMAL 4..4 '-') 3..3 HEXADECIMAL 12..12 {
+          def value
+            text_value
+          end
+        }
+      end   
+
       rule V_URI
         [a-z]+ '://' [^<>|\\{}^~"\[\] ]* { 
           def value
@@ -3348,7 +3381,7 @@ module OpenEHR
           end
         }
       end
-
+                                                             
       rule V_CHAR
         [^\\\n\"] {
           def value

data/lib/openehr/parser/adl_parser.rb

@@ -1,16 +1,16 @@
 require 'treetop'
-require 'polyglot'
+#require 'polyglot'
 
 require_relative '../parser'
+#require_relative './adl_grammar'
 
 module OpenEHR
   module Parser
     class ADLParser < ::OpenEHR::Parser::Base
-      require_relative './adl_grammar'
-#      Treetop.load('adl_grammar')
+      Treetop.load(File.join(File.dirname(__FILE__), 'adl_grammar.tt'))
 
       def initialize(filename)
-        super(filename)
+        super
       end
       
       def parse
@@ -24,13 +24,14 @@ module OpenEHR
       end
 
       def parsed_data
-        filestream = File.open(filename, 'r:bom|utf-8')
-        @parsed_data ||= adl_grammar_parser.parse(filestream.read)
+        filestream = File.open(@filename, 'rb:bom|utf-8')
+        @parsed_data ||= adl_grammar_parser.parse(filestream.read.scrub)
         filestream.close
         unless @parsed_data
           puts adl_grammar_parser.failure_reason
           puts adl_grammar_parser.failure_line
           puts adl_grammar_parser.failure_column
+          raise ParseError, 'Invalid ADL'
         end
         @parsed_data
       end
@@ -58,6 +59,10 @@ module OpenEHR
         parsed_data.adl_version
       end
 
+      def uid
+        OpenEHR::RM::Support::Identification::HierObjectID.new(value: parsed_data.uid) if parsed_data.uid
+      end
+
       def concept
         parsed_data.concept
       end
@@ -77,6 +82,7 @@ module OpenEHR
       def archetype
         OpenEHR::AM::Archetype::Archetype.new(:archetype_id => archetype_id,
                                   :adl_version => adl_version,
+                                  :uid => uid,            
                                   :concept => concept,
                                   :original_language => original_language,
                                   :translations => translations,

data/lib/openehr/parser/opt_parser.rb

@@ -3,19 +3,32 @@ require 'nokogiri'
 module OpenEHR
   module Parser
     class OPTParser < ::OpenEHR::Parser::Base
-      TEMPLATE_LANGUAGE_CODE_PATH = '/template/language/code_string'
-      TEMPLATE_LANGUAGE_TERM_ID_PATH = '/template/language/terminology_id/value'
+      TEMPLATE_LANGUAGE_CODE_PATH =
+        '/template/language/code_string'
+      TEMPLATE_LANGUAGE_TERM_ID_PATH =
+        '/template/language/terminology_id/value'      
       TEMPLATE_ID_PATH = '/template/template_id/value'
+      UID_PATH = '/template/uid/value'
       CONCEPT_PATH = '/template/concept'
-      DESC_ORIGINAL_AUTHOR_PATH = '/template/description/original_author'
-      DESC_LIFECYCLE_STATE_PATH = '/template/description/lifecycle_state'
-      DESC_DETAILS_LANGUAGE_TERM_ID_PATH = '/template/description/details/language/terminology_id/value'
-      DESC_DETAILS_LANGUAGE_CODE_PATH = '/template/description/details/language/code_string'
-      DESC_DETAILS_PURPOSE_PATH = '/template/description/details/purpose'
-      DESC_DETAILS_KEYWORDS_PATH = '/template/description/details/keywords'
+      DESC_ORIGINAL_AUTHOR_PATH =
+        '/template/description/original_author'
+      DESC_LIFECYCLE_STATE_PATH =
+        '/template/description/lifecycle_state'
+      DESC_DETAILS_LANGUAGE_TERM_ID_PATH =
+        '/template/description/details/language/terminology_id/value'
+      DESC_DETAILS_LANGUAGE_CODE_PATH =
+        '/template/description/details/language/code_string'
+      DESC_DETAILS_PURPOSE_PATH =
+        '/template/description/details/purpose'
+      DESC_DETAILS_KEYWORDS_PATH =
+        '/template/description/details/keywords'
       DESC_DETAILS_USE_PATH = '/template/description/details/use'
-      DESC_DETAILS_MISUSE_PATH = '/template/description/details/misuse'
-      DESC_DETAILS_COPYRIGHT_PATH = '/template/description/details/copyright'
+      DESC_DETAILS_MISUSE_PATH =
+        '/template/description/details/misuse'
+      DESC_DETAILS_COPYRIGHT_PATH =
+        '/template/description/details/copyright'
+      DESC_OTHER_DETAILS_PATH =
+        '/template/description/other_details'
       DEFINITION_PATH = '/template/definition'
       OCCURRENCE_PATH = '/occurrences'
       
@@ -26,25 +39,29 @@ module OpenEHR
       def parse
         @opt = Nokogiri::XML::Document.parse(File.open(@filename))
         @opt.remove_namespaces!
-        terminology_id = OpenEHR::RM::Support::Identification::TerminologyID.new(value: text_on_path(@opt,TEMPLATE_LANGUAGE_TERM_ID_PATH))
-        language = OpenEHR::RM::DataTypes::Text::CodePhrase.new(code_string: text_on_path(@opt, TEMPLATE_LANGUAGE_CODE_PATH), terminology_id: terminology_id)
-        OpenEHR::AM::Template::OperationalTemplate.new(concept: concept, language: language, description: description, template_id: template_id, definition: definition)
+        uid = OpenEHR::RM::Support::Identification::UIDBasedID.new(value: text_on_path(@opt, UID_PATH))
+        defs = definition
+        OpenEHR::AM::Template::OperationalTemplate.new(uid: uid, concept: concept, language: language, description: description, template_id: template_id, definition: defs, component_terminologies: @component_terminologies)
       end
 
       private
 
       def template_id
-        OpenEHR::RM::Support::Identification::TemplateID.new(value: text_on_path(@opt, TEMPLATE_ID_PATH))
+        @template_id ||= OpenEHR::RM::Support::Identification::TemplateID.new(value: text_on_path(@opt, TEMPLATE_ID_PATH))
       end
 
       def concept
         text_on_path(@opt, CONCEPT_PATH)
       end
 
+      def language
+        @language ||= OpenEHR::RM::DataTypes::Text::CodePhrase.new(code_string: text_on_path(@opt, TEMPLATE_LANGUAGE_CODE_PATH), terminology_id: OpenEHR::RM::Support::Identification::TerminologyID.new(value: text_on_path(@opt,TEMPLATE_LANGUAGE_TERM_ID_PATH)))
+      end
+
       def description
         original_author = text_on_path(@opt, DESC_ORIGINAL_AUTHOR_PATH)
         lifecycle_state = text_on_path(@opt, DESC_LIFECYCLE_STATE_PATH)
-        OpenEHR::RM::Common::Resource::ResourceDescription.new(original_author: original_author, lifecycle_state: lifecycle_state, details: [description_details])
+        OpenEHR::RM::Common::Resource::ResourceDescription.new(original_author: original_author, lifecycle_state: lifecycle_state, details: [description_details], other_details: description_other_details)
       end
 
       def description_details
@@ -58,20 +75,42 @@ module OpenEHR
         OpenEHR::RM::Common::Resource::ResourceDescriptionItem.new(language: language, purpose: purpose, keywords: keywords, use: use, misuse: misuse, copyright: copyright)
       end
 
+      def description_other_details
+        @opt.xpath(DESC_OTHER_DETAILS_PATH).inject({}) do |hash, detail|
+          hash[detail.attributes['id'].value] = detail.text
+          hash
+        end
+      end
+
       def definition
-        root_rm_type = text_on_path(@opt, DEFINITION_PATH + '/rm_type_name')
-        root_node = Node.new
-        root_node.id = text_on_path(@opt, DEFINITION_PATH + '/node_id')
-        root_occurrences = occurrences(@opt.xpath(DEFINITION_PATH + OCCURRENCE_PATH))
-        root_archetype_id = OpenEHR::RM::Support::Identification::ArchetypeID.new(value: text_on_path(@opt, DEFINITION_PATH+'/archetype_id/value'))
-        root_node.path = "/[#{root_archetype_id.value}]"
-        OpenEHR::AM::Archetype::ConstraintModel::CArchetypeRoot.new(rm_type_name: root_rm_type, node_id: root_node.id, path: root_node.path, occurrences: root_occurrences, archetype_id: root_archetype_id, attributes: attributes(@opt.xpath(DEFINITION_PATH+'/attributes'), root_node))
+        c_archetype_root @opt.xpath(DEFINITION_PATH)
       end
 
-      def children(children_xml, node)
-        children_xml.map do |child|
-          send child.attributes['type'].text.downcase, child, node
+      def component_terminologies(archetype_id, nodes)
+        @component_terminologies ||= Hash.new
+        @component_terminologies[archetype_id.value] =
+          archetype_terminology(nodes)
+      end
+
+      def archetype_terminology(nodes)
+        td = term_definitions(nodes)
+        concept_code = td[language.code_string][0]
+        OpenEHR::AM::Archetype::Terminology::
+          ArchetypeTerminology.new(
+                concept_code: concept_code,
+                original_language: language,
+                term_definitions: td)
+      end
+
+      def term_definitions(nodes)
+        term_definitions = nodes.xpath 'term_definitions'
+        term_items = term_definitions.map do |term|
+          code = term.attributes['code'].value
+          text = term.at('items[@id="text"]').text
+          description = term.at('items[@id="description"]').text
+          OpenEHR::AM::Archetype::Terminology::ArchetypeTerm.new(code: code, items: {'text' => text, 'description' => description})
         end
+        { language.code_string => term_items }
       end
 
       def c_archetype_root(xml, node = Node.new)
@@ -81,10 +120,11 @@ module OpenEHR
         occurrences = occurrences(xml.xpath('./occurrences'))
         archetype_id = OpenEHR::RM::Support::Identification::ArchetypeID.new(value: text_on_path(xml, './archetype_id/value'))
         if node.root? or node.id.nil?
-          node.path = "/[#{archetype_id.value}]"
-        else
-          node.path += "/[#{archetype_id.value}]"
+          node.path = "/"
+        # else
+        #   node.path += "/"  #"/[#{archetype_id.value}]"
         end
+        component_terminologies(archetype_id, xml)
         OpenEHR::AM::Archetype::ConstraintModel::CArchetypeRoot.new(rm_type_name: rm_type_name, node_id: node.id, path: node.path, occurrences: occurrences, archetype_id: archetype_id, attributes: attributes(xml.xpath('./attributes'), node))
       end
 
@@ -93,55 +133,51 @@ module OpenEHR
         node_id = xml.xpath('./node_id').text
         unless node_id.nil? or node_id.empty?
           node.id = node_id
-          node.path += "[#{node_id}]"
+          node.path = "#{node.path}[#{node.id}]"
         end
         OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(rm_type_name: rm_type_name, node_id: node.id, path: node.path, occurrences: occurrences(xml.xpath('./occurrences')), attributes: attributes(xml.xpath('./attributes'), node))
       end
 
       def attributes(attributes_xml, node)
         attributes_xml.map do |attr|
-          send attr.attributes['type'].text.downcase, attr, node
+          rm_attribute_name = attr.at('rm_attribute_name').text
+          if node.root?
+            path = "/#{rm_attribute_name}"
+          # elsif node.id
+          #   path = "#{node.path}[#{node.id}]/#{rm_attribute_name}"
+          else
+            path = "#{node.path}/#{rm_attribute_name}"
+          end
+          child_node = Node.new(node)
+          child_node.path = path
+          child_node.id = node.id
+          send attr.attributes['type'].text.downcase, attr, child_node
+        end
+      end
+
+      def children(children_xml, node)
+        children_xml.map do |child|
+          send child.attributes['type'].text.downcase, child, node
         end
       end
 
       def c_single_attribute(attr_xml, node)
         rm_attribute_name = attr_xml.at('rm_attribute_name').text
         existence = occurrences(attr_xml.at('existence'))
-        if node.root?
-          path = "/#{rm_attribute_name}"
-        elsif node.id
-          path = "#{node.path}[#{node.id}]/#{rm_attribute_name}"
-        else
-          path = "#{node.path}/#{rm_attribute_name}"
-        end
-        child_node = Node.new(node)
-        child_node.path = node.path
-        child_node.id = node.id
-        OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: path, children: children(attr_xml.xpath('./children'), child_node))
+        OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: node.path, children: children(attr_xml.xpath('./children'), node))
       end
 
       def c_multiple_attribute(attr_xml, node)
         rm_attribute_name = attr_xml.at('rm_attribute_name').text
         existence = occurrences(attr_xml.at('existence'))
-        if node.root?
-          path = "/#{rm_attribute_name}"
-        elsif node.id
-          path = "#{node.path}[#{node.id}]/#{rm_attribute_name}"
-        else
-          path = "#{node.path}/#{rm_attribute_name}"
-        end
-        child_node = Node.new(node)
-        child_node.path = node.path
-        child_node.id = node.id
-        OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: path, children: children(attr_xml.xpath('./children'), child_node))
+        OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: node.path, cardinality: cardinality(attr_xml), children: children(attr_xml.xpath('./children'), node))
       end
 
       def c_code_phrase(attr_xml, node)
         terminology_id = OpenEHR::RM::Support::Identification::TerminologyID.new(value: attr_xml.at('terminology_id/value').text.strip)
-        path = node.path
         code_list = attr_xml.xpath('code_list').text.strip
         occurrences = occurrences(attr_xml.at('occurrences'))
-        OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(terminology_id: terminology_id, code_list: [code_list], path: path, occurrences: occurrences, rm_type_name: 'CodePhrase')
+        OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(terminology_id: terminology_id, code_list: [code_list], path: node.path, occurrences: occurrences, rm_type_name: 'CodePhrase')
       end
 
       def archetype_slot(attr_xml,node)
@@ -166,6 +202,13 @@ module OpenEHR
         OpenEHR::AssumedLibraryTypes::Interval.new(lower: lower, upper: upper, lower_included: lower_included, upper_included: upper_included)
       end
 
+      def cardinality(xml)
+        order = to_bool(xml.at('is_ordered').text)
+        unique = to_bool(xml.at('is_unique').text)
+        interval = occurrences(xml)
+        OpenEHR::AM::Archetype::ConstraintModel::Cardinality.new(is_ordered: order, is_unique: unique, interval: interval)
+      end        
+
       def constraint_ref(attr_xml, node)
         rm_type_name = attr_xml.at('rm_type_name').text
         reference = attr_xml.at('reference').text
@@ -204,12 +247,19 @@ module OpenEHR
       def c_primitive_object(attr_xml, node)
         rm_type_name = attr_xml.at('rm_type_name').text
         occurrences = occurrences(attr_xml.at('occurrences'))
-        OpenEHR::AM::Archetype::ConstraintModel::CPrimitiveObject.new(rm_type_name: rm_type_name, occurrences: occurrences, node_id: node.id)
+        item = send attr_xml.at('item')['type'].downcase, attr_xml.at('item')
+        OpenEHR::AM::Archetype::ConstraintModel::CPrimitiveObject.new(rm_type_name: rm_type_name, occurrences: occurrences, node_id: node.id, item: item)
       end
-      
+
       def c_string(attr_xml)
-        pattern = attr_xml.at('pattern').text
-        OpenEHR::AM::Archetype::ConstraintModel::Primitive::CString.new(pattern: pattern)
+        if attr_xml.at('pattern')
+          OpenEHR::AM::Archetype::ConstraintModel::Primitive::CString.new(pattern: attr_xml.at('pattern').text)
+        else
+          list = attr_xml.xpath('.//list').map do |str|
+            str.text
+          end
+          OpenEHR::AM::Archetype::ConstraintModel::Primitive::CString.new(list: list)
+        end
       end
 
       def c_dv_quantity(attr_xml, node)
@@ -227,9 +277,25 @@ module OpenEHR
         OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity::CDvQuantity.new(rm_type_name: rm_type_name, occurrences: occurrences, list: list, property: property)
       end
 
+      def c_date(xml)
+
+      end
+
+      def c_date_time(xml)
+        
+      end
+
+      def c_integer(xml)
+
+      end
+
+      def c_boolean(xml)
+      end
+
       def string(attr_xml)
         attr_xml.text
       end
+
       def empty_then_nil(val)
         if val.empty?
           return nil
@@ -243,9 +309,9 @@ module OpenEHR
       end
 
       def to_bool(str)
-        if str =~ /true/i
+        if /true/i =~ str
           return true
-        elsif str =~ /false/i
+        elsif /false/i =~ str
           return false
         end
         return nil