From e32227e90b8911200bfd103ff466ddb9231c6619 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 21 Oct 2011 13:49:35 -0400 Subject: SH-2557 WIP - some cleanup, added error message to try to isolate causes of translation failure --- indra/newview/lltranslate.h | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) mode change 100644 => 100755 indra/newview/lltranslate.h (limited to 'indra/newview/lltranslate.h') diff --git a/indra/newview/lltranslate.h b/indra/newview/lltranslate.h old mode 100644 new mode 100755 index e85a42e878..c7d6eac33f --- a/indra/newview/lltranslate.h +++ b/indra/newview/lltranslate.h @@ -43,8 +43,8 @@ public : { } - virtual void handleResponse(const std::string &translation, const std::string &recognized_lang) {}; - virtual void handleFailure() {}; + virtual void handleResponse(const std::string &translation, const std::string &recognized_lang) = 0; + virtual void handleFailure() = 0; public: ~TranslationReceiver() @@ -54,40 +54,7 @@ public : virtual void completedRaw( U32 status, const std::string& reason, const LLChannelDescriptors& channels, - const LLIOPipe::buffer_ptr_t& buffer) - { - if (200 <= status && status < 300) - { - LLBufferStream istr(channels, buffer.get()); - std::stringstream strstrm; - strstrm << istr.rdbuf(); - - const std::string result = strstrm.str(); - std::string translation; - std::string detected_language; - - if (!parseGoogleTranslate(result, translation, detected_language)) - { - handleFailure(); - return; - } - - // Fix up the response - LLStringUtil::replaceString(translation, "<", "<"); - LLStringUtil::replaceString(translation, ">",">"); - LLStringUtil::replaceString(translation, ""","\""); - LLStringUtil::replaceString(translation, "'","'"); - LLStringUtil::replaceString(translation, "&","&"); - LLStringUtil::replaceString(translation, "'","'"); - - handleResponse(translation, detected_language); - } - else - { - LL_WARNS("Translate") << "HTTP request for Google Translate failed with status " << status << ", reason: " << reason << LL_ENDL; - handleFailure(); - } - } + const LLIOPipe::buffer_ptr_t& buffer); protected: const std::string m_toLang; -- cgit v1.2.3