Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix return value for Manager::parseOpdsDom #1100

Closed
wants to merge 2 commits into from
Closed

Fix return value for Manager::parseOpdsDom #1100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85d64ca
Fix return value for Manager::parseOpdsDom
BPerlakiH Jul 12, 2024
6a048ec
Revert m_hasSearchResult changes
BPerlakiH Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ bool Manager::parseOpdsDom(const pugi::xml_document& doc, const std::string& url
m_hasSearchResult = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m_hasSearchResul is a member of Manager and is public, so part of the API.
Even if, indeed, it is not used in any of our project, we cannot simply not set it.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, makes sense, I have reverted that part.

} catch(...) {
m_hasSearchResult = false;
return false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The totalResults/startIndex/itemsPerPage nodes are present when parsing a OPDS which is a search result. If parsing a root opds stream, they are not present.
So we must not stop the parsing of the opds stream if they are not present.

}

for (pugi::xml_node entryNode = libraryNode.child("entry"); entryNode;
Expand Down
Loading