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

Fix nameMapper initialization.

This commit is contained in:
Matthieu Gautier 2019-08-12 16:16:26 +02:00
parent a8668db2fe
commit d90a27af11
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/name_mapper.cpp
View File

@ -35,10 +35,13 @@ HumanReadableNameMapper::HumanReadableNameMapper(kiwix::Library& library, bool w
continue; continue;
auto aliasName = replaceRegex(bookName, "", "_[[:digit:]]{4}-[[:digit:]]{2}$"); auto aliasName = replaceRegex(bookName, "", "_[[:digit:]]{4}-[[:digit:]]{2}$");
if (aliasName == bookName) {
continue;
}
if (m_nameToId.find(aliasName) == m_nameToId.end()) { if (m_nameToId.find(aliasName) == m_nameToId.end()) {
m_nameToId[aliasName] = bookId; m_nameToId[aliasName] = bookId;
} else { } else {
auto alreadyPresentPath = library.getBookById(aliasName).getPath(); auto alreadyPresentPath = library.getBookById(m_nameToId[aliasName]).getPath();
std::cerr << "Path collision: " << alreadyPresentPath std::cerr << "Path collision: " << alreadyPresentPath
<< " and " << currentBook.getPath() << " and " << currentBook.getPath()
<< " can't share the same URL path '" << aliasName << "'." << " can't share the same URL path '" << aliasName << "'."