server/handlerwrappers/default.rb in cpee-1.3.207 vs server/handlerwrappers/default.rb in cpee-1.3.208

- old
+ new

@@ -11,19 +11,19 @@ # You should have received a copy of the GNU General Public License along with # CPEE (file COPYING in the main directory). If not, see # <http://www.gnu.org/licenses/>. class DefaultHandlerWrapper < WEEL::HandlerWrapperBase - def self::inform_syntax_error(arguments,err,code)# {{{ - controller = arguments[0] - controller.notify("description/error", :instance => controller.instance, :message => err.message) - end# }}} def self::inform_state_change(arguments,newstate) # {{{ controller = arguments[0] controller.serialize_state! controller.notify("state/change", :instance => controller.instance, :state => newstate) end # }}} + def self::inform_syntax_error(arguments,err,code)# {{{ + controller = arguments[0] + controller.notify("description/error", :instance => controller.instance, :message => err.message) + end# }}} def self::inform_handlerwrapper_error(arguments,err) # {{{ controller = arguments[0] controller.notify("handlerwrapper/error", :instance => controller.instance, :message => err.message) end # }}} def self::inform_position_change(arguments,ipc={}) # {{{ @@ -58,11 +58,18 @@ params << Riddl::Header.new("CPEE_INSTANCE",@controller.instance_url) params << Riddl::Header.new("CPEE_CALLBACK",@controller.instance_url + '/callbacks/' + callback) params << Riddl::Header.new("CPEE_CALLBACK_ID",callback) params << Riddl::Header.new("CPEE_ACTIVITY",@handler_position) params << Riddl::Header.new("CPEE_LABEL",parameters[:label]) + params << Riddl::Header.new("CPEE-BASE",@controller.base_url) + params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance_url) + params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback) + params << Riddl::Header.new("CPEE-CALLBACK_ID",callback) + params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position) + params << Riddl::Header.new("CPEE-LABEL",parameters[:label]) @controller.attributes.each do |key,value| params << Riddl::Header.new("CPEE_ATTR_#{key}",value) + params << Riddl::Header.new("CPEE-ATTR-#{key.gsub(/_/,'-')}",value) end type = parameters[:method] || 'post' client = Riddl::Client.new(@handler_endpoint)