lib/openehr/parser/adl_parser.rb in openehr-1.2.99999 vs lib/openehr/parser/adl_parser.rb in openehr-1.2.999999

@@ -23,11 +23,11 @@
         @adl_grammar_parser ||= ADLGrammarParser.new
       end
 
       def parsed_data
         filestream = File.open(@filename, 'rb:bom|utf-8')
-        @parsed_data ||= adl_grammar_parser.parse(filestream.read)
+        @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
@@ -57,10 +57,14 @@
 
       def adl_version
         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
 
       def description
@@ -76,9 +80,10 @@
       end
 
       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,
                                   :description => description,
                                   :definition => definition,