commit 6da66f1b6e86ac9b1305bdbb120077a2079600c6
author Mike Kaganski <mike.kaganski@collabora.com> Fri Mar 03 21:58:48 2023 +0300
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Mar 07 10:30:25 2023 +0000
tree cca3100169e7ea9229b96ea8fa15db94a82ec081
parent e82777b1cd6b91277942b35590c18bb073c01bf5

tdf#153948: LanguageTool: cache the prepared request

So that when the same text is re-checked using different
settings (e.g., language), the cached result is not used.

Change-Id: Ic4ed63c6835f9d3935f1b9541c80822bb52313c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148200
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148298

lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx

diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
index a2ad3ef..3d9336f 100644
--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
@@ -215,18 +215,18 @@ ProofreadingResult SAL_CALL LanguageToolGrammarChecker::doProofreading(
    xRes.nBehindEndOfSentencePosition
        = std::min(xRes.nStartOfNextSentencePosition, aText.getLength());

    auto cachedResult = mCachedResults.find(aText);
    if (cachedResult != mCachedResults.end())
    OUString langTag(aLocale.Language + "-" + aLocale.Country);
    OString postData = OUStringToOString(Concat2View("text=" + aText + "&language=" + langTag),
                                         RTL_TEXTENCODING_UTF8);

    if (auto cachedResult = mCachedResults.find(postData); cachedResult != mCachedResults.end())
    {
        xRes.aErrors = cachedResult->second;
        return xRes;
    }

    tools::Long http_code = 0;
    OUString langTag(aLocale.Language + "-" + aLocale.Country);
    OString postData(OUStringToOString(Concat2View("text=" + aText + "&language=" + langTag),
                                       RTL_TEXTENCODING_UTF8));
    const std::string response_body
    std::string response_body
        = makeHttpRequest(checkerURL, HTTP_METHOD::HTTP_POST, postData, http_code);

    if (http_code != 200)
@@ -241,8 +241,7 @@ ProofreadingResult SAL_CALL LanguageToolGrammarChecker::doProofreading(

    parseProofreadingJSONResponse(xRes, response_body);
    // cache the result
    mCachedResults.insert(
        std::pair<OUString, Sequence<SingleProofreadingError>>(aText, xRes.aErrors));
    mCachedResults.insert(std::make_pair(postData, xRes.aErrors));
    return xRes;
}

lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx

diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx
index 0262be8..ea981e3 100644
--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx
+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx
@@ -47,7 +47,7 @@ class LanguageToolGrammarChecker
                                  css::lang::XServiceInfo, css::lang::XServiceDisplayName>
{
    css::uno::Sequence<css::lang::Locale> m_aSuppLocales;
    o3tl::lru_map<OUString, css::uno::Sequence<css::linguistic2::SingleProofreadingError>>
    o3tl::lru_map<OString, css::uno::Sequence<css::linguistic2::SingleProofreadingError>>
        mCachedResults;
    LanguageToolGrammarChecker(const LanguageToolGrammarChecker&) = delete;
    LanguageToolGrammarChecker& operator=(const LanguageToolGrammarChecker&) = delete;