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

Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

This commit is contained in:
Ayoub DARDORY 2013-06-22 18:41:00 +01:00
parent 4ab6898586 15b6c4f8b2
commit ac50d0eade
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/kiwix/manager.cpp
View File

@ -254,12 +254,6 @@ namespace kiwix {
book.creator = reader->getCreator(); book.creator = reader->getCreator();
book.publisher = reader->getPublisher(); book.publisher = reader->getPublisher();
book.title = reader->getTitle(); book.title = reader->getTitle();
if (book.title.empty()) {
book.title = getLastPathElement(path);
std::replace(book.title.begin(), book.title.end(), '_', ' ');
size_t pos = book.title.find(".zim");
book.title = book.title.substr(0, pos);
}
std::ostringstream articleCountStream; std::ostringstream articleCountStream;
articleCountStream << reader->getArticleCount(); articleCountStream << reader->getArticleCount();

6
src/common/kiwix/reader.cpp
View File

@ -245,6 +245,12 @@ namespace kiwix {
string Reader::getTitle() { string Reader::getTitle() {
string value; string value;
this->getMetatag("Title", value); this->getMetatag("Title", value);
if (value.empty()) {
value = getLastPathElement(zimFileHandler->getFilename());
std::replace(value.begin(), value.end(), '_', ' ');
size_t pos = value.find(".zim");
value = value.substr(0, pos);
}
return value; return value;
} }