From d27bf99d02136e44a74a1a2f8f882ab50a52636f Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 20 Nov 2007 19:49:03 +0000 Subject: [PATCH] still working on the perl locale stuff git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1133 9efc2488-bf62-4759-914b-345cdb29e865 --- src/perlmods/OpenSRF/DomainObject/oilsMessage.pm | 6 ++++-- src/perlmods/OpenSRF/Transport.pm | 4 ---- src/perlmods/OpenSRF/Transport/SlimJabber/Client.pm | 2 -- .../OpenSRF/Transport/SlimJabber/MessageWrapper.pm | 12 ------------ 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm b/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm index 0d0f327..ef7dc9f 100644 --- a/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm +++ b/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm @@ -181,10 +181,12 @@ sub handler { my $session = shift; my $mtype = $self->type; - my $locale = $self->sender_locale; - my $api_level = $self->api_level || 1;; + my $locale = $self->sender_locale || ''; + my $api_level = $self->api_level || 1; my $tT = $self->threadTrace; + $logger->debug("Message locale is $locale", DEBUG); + $session->last_message_type($mtype); $session->last_message_api_level($api_level); $session->last_threadTrace($tT); diff --git a/src/perlmods/OpenSRF/Transport.pm b/src/perlmods/OpenSRF/Transport.pm index bf29dc8..33de5c4 100644 --- a/src/perlmods/OpenSRF/Transport.pm +++ b/src/perlmods/OpenSRF/Transport.pm @@ -87,7 +87,6 @@ sub handler { # Extract message information my $remote_id = $helper->get_remote_id(); my $sess_id = $helper->get_sess_id(); - my $locale = $helper->get_locale(); my $body = $helper->get_body(); my $type = $helper->get_msg_type(); @@ -153,9 +152,6 @@ sub handler { } } - # set the locale for the session, if passed - $app_session->session_locale($locale) if ($locale); - # cycle through and pass each oilsMessage contained in the message # up to the message layer for processing. for my $msg (@$doc) { diff --git a/src/perlmods/OpenSRF/Transport/SlimJabber/Client.pm b/src/perlmods/OpenSRF/Transport/SlimJabber/Client.pm index 18529c5..0447da3 100644 --- a/src/perlmods/OpenSRF/Transport/SlimJabber/Client.pm +++ b/src/perlmods/OpenSRF/Transport/SlimJabber/Client.pm @@ -406,7 +406,6 @@ sub send { my $thread = $params{'thread'} || ""; my $router_command = $params{'router_command'} || ""; my $router_class = $params{'router_class'} || ""; - my $locale = $params{'locale'} || ""; my $msg = OpenSRF::Transport::SlimJabber::MessageWrapper->new; @@ -415,7 +414,6 @@ sub send { $msg->setBody( $body ); $msg->set_router_command( $router_command ); $msg->set_router_class( $router_class ); - $msg->set_locale( $locale ); $msg->set_osrf_xid($logger->get_osrf_xid); $logger->transport( diff --git a/src/perlmods/OpenSRF/Transport/SlimJabber/MessageWrapper.pm b/src/perlmods/OpenSRF/Transport/SlimJabber/MessageWrapper.pm index 79011dd..6375f6d 100644 --- a/src/perlmods/OpenSRF/Transport/SlimJabber/MessageWrapper.pm +++ b/src/perlmods/OpenSRF/Transport/SlimJabber/MessageWrapper.pm @@ -122,16 +122,4 @@ sub get_osrf_xid { $self->{msg_node}->getAttribute('osrf_xid'); } -sub set_locale { - my( $self, $xid ) = @_; - $self->{msg_node}->setAttribute( locale => $xid ); -} - - -sub get_locale { - my $self = shift; - $self->{msg_node}->getAttribute('locale'); -} - - 1; -- 2.43.2