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

better deal with *.zimaa paths

This commit is contained in:
kelson42 2012-10-14 12:18:57 +00:00
parent 63c210db1c
commit 956d37dee8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,17 @@ namespace kiwix {
/* Constructor */ /* Constructor */
Reader::Reader(const string zimFilePath) Reader::Reader(const string zimFilePath)
: zimFileHandler(NULL) { : zimFileHandler(NULL) {
string tmpZimFilePath = zimFilePath;
this->zimFileHandler = new zim::File(zimFilePath); /* Remove potential trailing zimaa */
size_t found = tmpZimFilePath.rfind("zimaa");
if (found != string::npos &&
tmpZimFilePath.size() > 5 &&
found == tmpZimFilePath.size() - 5) {
tmpZimFilePath.resize(tmpZimFilePath.size() - 2);
}
this->zimFileHandler = new zim::File(tmpZimFilePath);
if (this->zimFileHandler != NULL) { if (this->zimFileHandler != NULL) {
this->firstArticleOffset = this->zimFileHandler->getNamespaceBeginOffset('A'); this->firstArticleOffset = this->zimFileHandler->getNamespaceBeginOffset('A');