Changeset 0a11f975ff365fd1126c45cad8b8e5f48ed94fc6

Timestamp:

06/27/07 00:56:09 (19 months ago)

Author:

segfault <segfault@…>

Parents:

85bd278bd86d778d6470d03712e0518ad48f49a7

Children:

0f328931727ae67b2b7f9854942844792fdd24b2

git-committer:

segfault <segfault@72d81af0-b0fa-4b65-b54c-2b622d79b57a> / 2007-06-27T04:56:09Z+0000

Message:

child segment parsing seems to work
re-worked the way child segments are printed

git-svn-id: svn://hasno.info/ruby-hl7/trunk@38 72d81af0-b0fa-4b65-b54c-2b622d79b57a

Files:

• lib/ruby-hl7.rb (modified) (15 diffs)
• lib/segments/obr.rb (modified) (1 diff)
• lib/segments/obx.rb (modified) (1 diff)
• test/test_basic_parsing.rb (modified) (1 diff)
• test/test_child_segment.rb (modified) (1 diff)
• test_data/test.hl7 (modified) (1 diff)

lib/ruby-hl7.rb

@@ -92 +92 @@
 
     if block_given?
-      blk.call
+      blk.call self
     end
   end
@@ -123 +123 @@
     if index.kind_of?(Range) || index.kind_of?(Fixnum)
       @segments[ index ] = value
+    elsif index.respond_to?(:to_sym)
+      (@segments_by_name[ index.to_sym ] ||= []) << value
     else
-      (@segments_by_name[ index.to_sym ] ||= []) << value
-    end
+      raise HL7::Exception.new( "attempting to use an indice that is not a Range, Fixnum or to_sym providing object" )
+    end
+
+    value.parent = self
   end
 
@@ -146 +150 @@
     end
 
+    value.parent = self unless value.parent && value.parent == self # this limits us to two levels.
     (@segments ||= []) << value
     name = value.class.to_s.gsub("HL7::Message::Segment::", "").to_sym
@@ -180 +185 @@
 
   # provide a screen-readable version of the message
-  def to_s                         
-    @segments.join( '\n' )
+  def to_s    
+    @segments.join( "\n" )                               
   end
 
   # provide a HL7 spec version of the message
   def to_hl7
-    @segments.join( @segment_delim )
+    segs = @segments.collect { |s| s if s.to_s.length > 0 }
+    segs.join( @segment_delim ) 
   end
 
@@ -239 +245 @@
     raise HL7::ParseError.new unless ary.length > 0
 
+    last_seg = nil
     ary.each do |elm|
+      last_seg = generate_segment( elm, last_seg )
+    end
+  end
+
+  def generate_segment( elm, last_seg )
       seg_parts = elm.split( @element_delim, -1 )
       raise HL7::ParseError.new unless seg_parts && (seg_parts.length > 0)
@@ -252 +264 @@
       end
       new_seg = kls.new( elm )
+      ret = new_seg
+
+      if last_seg && last_seg.respond_to?(:children) && last_seg.accepts?( seg_name )
+        last_seg.children << new_seg
+        new_seg.is_child = true
+        ret = last_seg
+      end
+
       @segments << new_seg
 
@@ -260 +280 @@
         @segments_by_name[ seg_sym ] << new_seg
       end
-    end
-
+
+      ret 
   end
 end                
@@ -284 +304 @@
 #      
 class HL7::Message::Segment
+  attr :parent, true
   attr :element_delim
   attr :item_delim
@@ -295 +316 @@
     @element_delim = '|'
     @field_total = 0
+    @is_child = false
 
     if (raw_segment.kind_of? Array)
@@ -369 +391 @@
   end
 
+  # sort-compare two Segments, 0 indicates equality
   def <=>( other ) 
     return nil unless other.kind_of?(HL7::Message::Segment)
@@ -384 +407 @@
   end
 
+
+  # return true if the segment has a parent 
+  def is_child?
+    (@is_child ||= false)
+  end
+
+  # indicate whether or not the segment has a parent
+  def is_child=(val)
+    @is_child = val
+  end
+
+  # get the length of the segment (number of fields it contains)
+  def length
+    0 unless @elements
+    @elements.length
+  end
+
+
   private
   def self.singleton #:nodoc:
     class << self; self end
   end
-
 
   # DSL element to define a segment's sort weight
@@ -409 +449 @@
   # allows a segment to store other segment objects
   # used to handle associated lists like one OBR to many OBX segments
-  def self.has_children
+  def self.has_children(child_types)
+    @child_types = child_types
+    define_method(:child_types) do
+      @child_types
+    end
+
     self.class_eval do
       define_method(:children) do
         unless @my_children
+          p = self
           @my_children ||= []
           @my_children.instance_eval do
+            @parental = p
             alias :old_append :<<
 
@@ -421 +468 @@
                 raise HL7::Exception.new( "attempting to append non-segment to a segment list" )
               end
-        
+
+              value.parent = self 
               old_append( value )
             end
@@ -430 +478 @@
       end
 
-      alias :my_to_s :to_s
-      define_method(:to_s) do
-        out = my_to_s
-        if @my_children
-          @my_children.each do |seg|
-            out << '\r'
-            out << seg.to_s
-          end
-        end
-        out
-      end
-    end
-      
-  end
+      define_method('accepts?') do |t|
+        t = t.to_sym if t && (t.to_s.length > 0) && t.respond_to?(:to_sym)
+        child_types.index t
+      end
+    end 
+  end 
 
   # define a field alias 
@@ -531 +571 @@
   @elements = []
 
-
 end
 

lib/segments/obr.rb

@@ -3 +3 @@
 class HL7::Message::Segment::OBR < HL7::Message::Segment
   weight 89 # obr.weight-1
-  has_children
+  has_children [:OBX]
   add_field :name=>:set_id
   add_field :name=>:placer_order_number

lib/segments/obx.rb

@@ -3 +3 @@
 class HL7::Message::Segment::OBX < HL7::Message::Segment
   weight 90
+  has_children [:NTE]
   add_field :name=>:set_id
   add_field :name=>:value_type

test/test_basic_parsing.rb

@@ -41 +41 @@
     msg = HL7::Message.new
     msg.parse @simple_msh_txt
-    orig = @simple_msh_txt.gsub( /\r/, '\n' )
+    orig = @simple_msh_txt.gsub( /\r/, "\n" )
     assert_equal( orig, msg.to_s )
   end

test/test_child_segment.rb

@@ -15 +15 @@
     assert_equal( 3, msg[:OBR].length ) 
     assert_not_nil msg[:OBR].first.children
+    assert_equal( 5, msg[:OBR].first.children.length )
 
     msg[:OBR].first.children.each do |x|

test_data/test.hl7

@@ -7 +7 @@
 OBX||FT|EXAM^MICROSCOPIC||GRAM POSITIVE COCCI IN GROUPS||
 
-