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

Update libkiwix with search iterator rename in libzim 

Search iterator API in libzim has been shifted to use camel case naming.
This has to be accomodated in libkiwix as well.
This commit is contained in:
Maneesh P M 2021-05-24 10:24:31 +05:30 committed by Emmanuel Engelhart
parent 7ef08b670b
commit e5fac30cee
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++) {
std::vector<std::string> suggestion;
suggestion.push_back(current->getTitle());
suggestion.push_back(current->getPath());
suggestion.push_back(kiwix::normalize(current->getTitle()));
suggestion.push_back(current.getTitle());
suggestion.push_back(current.getPath());
suggestion.push_back(kiwix::normalize(current.getTitle()));
results.push_back(suggestion);
}
retVal = true;

14
src/searcher.cpp
View File

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