From 414d7ae4fe58652d96fef503d69baef740c45d26 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Fri, 21 Oct 2022 16:37:06 +0400 Subject: [PATCH] Fixed indentation --- src/server/internalServer.cpp | 128 +++++++++++++++++----------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index 8d253fac0..0e3137a8d 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -823,81 +823,81 @@ std::unique_ptr InternalServer::handle_search(const RequestContext& re std::unique_ptr InternalServer::handle_search_request(const RequestContext& request) { - auto searchInfo = getSearchInfo(request); - auto bookIds = searchInfo.getBookIds(); + auto searchInfo = getSearchInfo(request); + auto bookIds = searchInfo.getBookIds(); - /* Make the search */ - // Try to get a search from the searchInfo, else build it - auto searcher = mp_library->getSearcherByIds(bookIds); - auto lock(searcher->getLock()); + /* Make the search */ + // Try to get a search from the searchInfo, else build it + auto searcher = mp_library->getSearcherByIds(bookIds); + auto lock(searcher->getLock()); - std::shared_ptr search; - try { - search = searchCache.getOrPut(searchInfo, - [=](){ - return make_shared(searcher->search(searchInfo.getZimQuery(m_verbose.load()))); - } - ); - } catch(std::runtime_error& e) { - // Searcher->search will throw a runtime error if there is no valid xapian database to do the search. - // (in case of zim file not containing a index) - const auto cssUrl = renderUrl(m_root, RESOURCE::templates::url_of_search_results_css); - HTTPErrorResponse response(*this, request, MHD_HTTP_NOT_FOUND, - "fulltext-search-unavailable", - "404-page-heading", - cssUrl); - response += nonParameterizedMessage("no-search-results"); - // XXX: Now this has to be handled by the iframe-based viewer which - // XXX: has to resolve if the book selection resulted in a single book. - /* - if(bookIds.size() == 1) { - auto bookId = *bookIds.begin(); - auto bookName = mp_nameMapper->getNameForId(bookId); - response += TaskbarInfo(bookName, mp_library->getArchiveById(bookId).get()); + std::shared_ptr search; + try { + search = searchCache.getOrPut(searchInfo, + [=](){ + return make_shared(searcher->search(searchInfo.getZimQuery(m_verbose.load()))); } - */ - return response; - } - - auto start = 1; - try { - start = request.get_argument("start"); - } catch (const std::exception&) {} - start = max(1, start); - - auto pageLength = 25; - try { - pageLength = request.get_argument("pageLength"); - } catch (const std::exception&) {} - if (pageLength > MAX_SEARCH_LEN) { - pageLength = MAX_SEARCH_LEN; - } - if (pageLength == 0) { - pageLength = 25; - } - - /* Get the results */ - SearchRenderer renderer(search->getResults(start-1, pageLength), mp_nameMapper, mp_library, start, - search->getEstimatedMatches()); - renderer.setSearchPattern(searchInfo.pattern); - renderer.setSearchBookQuery(searchInfo.bookFilterQuery); - renderer.setProtocolPrefix(m_root + "/content/"); - renderer.setSearchProtocolPrefix(m_root + "/search"); - renderer.setPageLength(pageLength); - if (request.get_requested_format() == "xml") { - return ContentResponse::build(*this, renderer.getXml(), "application/rss+xml; charset=utf-8"); - } - auto response = ContentResponse::build(*this, renderer.getHtml(), "text/html; charset=utf-8"); + ); + } catch(std::runtime_error& e) { + // Searcher->search will throw a runtime error if there is no valid xapian database to do the search. + // (in case of zim file not containing a index) + const auto cssUrl = renderUrl(m_root, RESOURCE::templates::url_of_search_results_css); + HTTPErrorResponse response(*this, request, MHD_HTTP_NOT_FOUND, + "fulltext-search-unavailable", + "404-page-heading", + cssUrl); + response += nonParameterizedMessage("no-search-results"); // XXX: Now this has to be handled by the iframe-based viewer which // XXX: has to resolve if the book selection resulted in a single book. /* if(bookIds.size() == 1) { auto bookId = *bookIds.begin(); auto bookName = mp_nameMapper->getNameForId(bookId); - response->set_taskbar(bookName, mp_library->getArchiveById(bookId).get()); + response += TaskbarInfo(bookName, mp_library->getArchiveById(bookId).get()); } */ - return std::move(response); + return response; + } + + auto start = 1; + try { + start = request.get_argument("start"); + } catch (const std::exception&) {} + start = max(1, start); + + auto pageLength = 25; + try { + pageLength = request.get_argument("pageLength"); + } catch (const std::exception&) {} + if (pageLength > MAX_SEARCH_LEN) { + pageLength = MAX_SEARCH_LEN; + } + if (pageLength == 0) { + pageLength = 25; + } + + /* Get the results */ + SearchRenderer renderer(search->getResults(start-1, pageLength), mp_nameMapper, mp_library, start, + search->getEstimatedMatches()); + renderer.setSearchPattern(searchInfo.pattern); + renderer.setSearchBookQuery(searchInfo.bookFilterQuery); + renderer.setProtocolPrefix(m_root + "/content/"); + renderer.setSearchProtocolPrefix(m_root + "/search"); + renderer.setPageLength(pageLength); + if (request.get_requested_format() == "xml") { + return ContentResponse::build(*this, renderer.getXml(), "application/rss+xml; charset=utf-8"); + } + auto response = ContentResponse::build(*this, renderer.getHtml(), "text/html; charset=utf-8"); + // XXX: Now this has to be handled by the iframe-based viewer which + // XXX: has to resolve if the book selection resulted in a single book. + /* + if(bookIds.size() == 1) { + auto bookId = *bookIds.begin(); + auto bookName = mp_nameMapper->getNameForId(bookId); + response->set_taskbar(bookName, mp_library->getArchiveById(bookId).get()); + } + */ + return std::move(response); } std::unique_ptr InternalServer::handle_random(const RequestContext& request)