lib/open_ehr/parser/adl.rb in open_ehr-0.9.5 vs lib/open_ehr/parser/adl.rb in open_ehr-1.0.0

@@ -1,42 +1,42 @@
+require 'open_ehr/rm/data_types/text'
 include OpenEHR::RM::Support::Identification
 include OpenEHR::RM::Common::Resource
-include OpenEHR::RM::DataTypes::Text
 
 module OpenEHR
   module Parser
     module ADLGrammar
       class Base < Treetop::Runtime::SyntaxNode
 
       end
 
       class ArchLanguage < Base
         def value
-          Language.new(lang.value)
+          return Language.new(lang.value)
         end
       end
 
-
       class Language
+        include OpenEHR::RM::DataTypes::Text
         attr_reader :original_language, :translations
         
         def initialize(value)
           self.original_language = value['original_language']
           self.translations = value['translations']
         end
         
         def original_language=(original_language)
-          @original_language = code2lang original_language
+          @original_language = original_language
         end
         
         def translations=(translations)
           if translations.nil?
             @translations = nil
           else
             tr = translations.inject({ }) do |trans, lang|
               code, details  = lang
               td = TranslationDetails.new(
-                     :language => code2lang(details['language']),
+                     :language => details['language'],
                      :author => details['author'],
                      :accreditation => details['accreditation'],
                      :other_details => details['other_details'])
               trans.update Hash[code, td]
             end