[open-ils-commits] r806 - acq_edi/trunk/lib/edi (mbklein)

[svn at svn.open-ils.org]

Author: mbklein
Date: 2010-03-01 13:51:03 -0500 (Mon, 01 Mar 2010)
New Revision: 806

Modified:
   acq_edi/trunk/lib/edi/mapper.rb
Log:
Added :sender_qual and :recipient_qual as valid interchange initializer options

Modified: acq_edi/trunk/lib/edi/mapper.rb
===================================================================
--- acq_edi/trunk/lib/edi/mapper.rb	2010-03-01 18:46:51 UTC (rev 805)
+++ acq_edi/trunk/lib/edi/mapper.rb	2010-03-01 18:51:03 UTC (rev 806)
@@ -94,11 +94,9 @@
     def initialize(msg_type, msg_opts = {}, ic_opts = {})
       # Bug in edi4r 0.9 -- sometimes :recipient is used; sometimes :recip. It doesn't
       # work. We'll override it.
-      local_ic_opts = ic_opts.reject { |k,v| [:sender,:recipient].include?(k) }
+      local_ic_opts = ic_opts.reject { |k,v| [:sender,:sender_qual,:recipient,:recipient_qual].include?(k) }
       @ic = EDI::E::Interchange.new(local_ic_opts || {})
-      @ic.header.cS002.d0004 = ic_opts[:sender] unless ic_opts[:sender].nil?
-      @ic.header.cS003.d0010 = ic_opts[:recipient] unless ic_opts[:recipient].nil?
-      
+  
       # Apply any envelope defaults.
       ['UNA','UNB','UNZ'].each { |seg|
         seg_defs = self.class.defaults[seg]
@@ -113,6 +111,11 @@
           }
         end
       }
+
+      @ic.header.cS002.d0004 = ic_opts[:sender] unless ic_opts[:sender].nil?
+      @ic.header.cS002.d0007 = ic_opts[:sender_qual] unless ic_opts[:sender_qual].nil?
+      @ic.header.cS003.d0010 = ic_opts[:recipient] unless ic_opts[:recipient].nil?
+      @ic.header.cS003.d0007 = ic_opts[:recipient_qual] unless ic_opts[:recipient_qual].nil?
       
       @message = @ic.new_message( { :msg_type => msg_type, :version => 'D', :release => '96A', :resp_agency => 'UN' }.merge(msg_opts || {}) )
       @ic.add(@message,false)