lib/openwfe/expressions/merge.rb in openwferu-0.9.16 vs lib/openwfe/expressions/merge.rb in openwferu-0.9.17

- old
+ new

@@ -1,8 +1,8 @@ # #-- -# Copyright (c) 2007, John Mettraux, OpenWFE.org +# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # @@ -57,19 +57,25 @@ return wiSource unless wiTarget return wiTarget unless wiSource return wiSource if override + + #puts "merge()" + #puts "merge() source : " + wiSource.attributes.inspect + #puts "merge() target : " + wiTarget.attributes.inspect wiSource.attributes.each do |k, v| #puts "merge() '#{k}' => '#{v}'" nk = OpenWFE::fulldup k nv = OpenWFE::fulldup v wiTarget.attributes[nk] = nv end + + #puts "merge() target after : " + wiTarget.attributes.inspect wiTarget end end