smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Got rid of an unjustified parameter 

The XML header is injected in a more straightforward way in the single
location where it is needed.
This commit is contained in:
Veloman Yunkan 2022-10-06 12:48:37 +04:00
parent cd6cbe3655
commit ebb713cb85
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opds_dumper.cpp
View File

@ -49,6 +49,8 @@ void OPDSDumper::setOpenSearchInfo(int totalResults, int startIndex, int count)
namespace namespace
{ {
const std::string XML_HEADER(R"(<?xml version="1.0" encoding="UTF-8"?>)");
typedef kainjow::mustache::data MustacheData; typedef kainjow::mustache::data MustacheData;
typedef kainjow::mustache::list BooksData; typedef kainjow::mustache::list BooksData;
typedef kainjow::mustache::list IllustrationInfo; typedef kainjow::mustache::list IllustrationInfo;
@ -94,10 +96,9 @@ kainjow::mustache::object getSingleBookData(const Book& book)
}; };
} }
std::string getSingleBookEntryXML(const Book& book, bool withXMLHeader, const std::string& rootLocation, const std::string& endpointRoot, bool partial) std::string getSingleBookEntryXML(const Book& book, const std::string& rootLocation, const std::string& endpointRoot, bool partial)
{ {
auto data = getSingleBookData(book); auto data = getSingleBookData(book);
data["with_xml_header"] = MustacheData(withXMLHeader);
data["dump_partial_entries"] = MustacheData(partial); data["dump_partial_entries"] = MustacheData(partial);
data["endpoint_root"] = endpointRoot; data["endpoint_root"] = endpointRoot;
data["root"] = rootLocation; data["root"] = rootLocation;
@ -111,7 +112,7 @@ BooksData getBooksData(const Library* library, const std::vector<std::string>& b
try { try {
const Book book = library->getBookByIdThreadSafe(bookId); const Book book = library->getBookByIdThreadSafe(bookId);
booksData.push_back(kainjow::mustache::object{ booksData.push_back(kainjow::mustache::object{
{"entry", getSingleBookEntryXML(book, false, rootLocation, endpointRoot, partial)} {"entry", getSingleBookEntryXML(book, rootLocation, endpointRoot, partial)}
}); });
} catch ( const std::out_of_range& ) { } catch ( const std::out_of_range& ) {
// the book was removed from the library since its id was obtained // the book was removed from the library since its id was obtained
@ -218,7 +219,10 @@ string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const
std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const
{ {
return getSingleBookEntryXML(library->getBookById(bookId), true, rootLocation, "", false); const auto book = library->getBookById(bookId);
return XML_HEADER
+ "\n"
+ getSingleBookEntryXML(book, rootLocation, "", false);
} }
std::string OPDSDumper::categoriesOPDSFeed() const std::string OPDSDumper::categoriesOPDSFeed() const

3
static/templates/catalog_v2_entry.xml
View File

@ -1,5 +1,4 @@
{{#with_xml_header}}<?xml version="1.0" encoding="UTF-8"?> <entry>
{{/with_xml_header}} <entry>
<id>urn:uuid:{{id}}</id> <id>urn:uuid:{{id}}</id>
<title>{{title}}</title> <title>{{title}}</title>
<updated>{{updated}}</updated> <updated>{{updated}}</updated>