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

Merge pull request #537 from kiwix/search_iterator_api_rename 

Update libkiwix with search iterator rename in libzim
This commit is contained in:
Kelson 2021-05-26 08:49:26 +02:00 committed by GitHub
parent 7ef08b670b e5fac30cee
commit 9c0ae835e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/reader.cpp
View File

@ -507,9 +507,9 @@ bool Reader::searchSuggestionsSmart(const string& prefix,
current != suggestions.end(); current != suggestions.end();
current++) { current++) {
std::vector<std::string> suggestion; std::vector<std::string> suggestion;
suggestion.push_back(current->getTitle()); suggestion.push_back(current.getTitle());
suggestion.push_back(current->getPath()); suggestion.push_back(current.getPath());
suggestion.push_back(kiwix::normalize(current->getTitle())); suggestion.push_back(kiwix::normalize(current.getTitle()));
results.push_back(suggestion); results.push_back(suggestion);
} }
retVal = true; retVal = true;

14
src/searcher.cpp
View File

@ -235,19 +235,19 @@ _Result::_Result(zim::SearchResultSet::iterator iterator)
std::string _Result::get_url() std::string _Result::get_url()
{ {
return iterator.get_path(); return iterator.getPath();
} }
std::string _Result::get_title() std::string _Result::get_title()
{ {
return iterator.get_title(); return iterator.getTitle();
} }
int _Result::get_score() int _Result::get_score()
{ {
return iterator.get_score(); return iterator.getScore();
} }
std::string _Result::get_snippet() std::string _Result::get_snippet()
{ {
return iterator.get_snippet(); return iterator.getSnippet();
} }
std::string _Result::get_content() std::string _Result::get_content()
{ {
@ -255,15 +255,15 @@ std::string _Result::get_content()
} }
int _Result::get_size() int _Result::get_size()
{ {
return iterator.get_size(); return iterator.getSize();
} }
int _Result::get_wordCount() int _Result::get_wordCount()
{ {
return iterator.get_wordCount(); return iterator.getWordCount();
} }
int _Result::get_readerIndex() int _Result::get_readerIndex()
{ {
return iterator.get_fileIndex(); return iterator.getFileIndex();
} }