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

+ more robus mimetype retrieving

This commit is contained in:
Kelson42 2014-09-14 18:40:39 +02:00
parent 55927937dd
commit d8a924121b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,14 +421,21 @@ namespace kiwix {
article = article.getRedirectArticle(); article = article.getRedirectArticle();
} }
/* Compute base url (might be different from the url if redirects */ if (loopCounter < 42) {
baseUrl = "/" + std::string(1, article.getNamespace()) + "/" + article.getUrl(); /* Compute base url (might be different from the url if redirects */
baseUrl = "/" + std::string(1, article.getNamespace()) + "/" + article.getUrl();
/* Get the content mime-type */
contentType = string(article.getMimeType().data(), article.getMimeType().size()); /* Get the content mime-type */
try {
contentType = string(article.getMimeType().data(), article.getMimeType().size());
} catch (exception &e) {
cerr << "Unable to get the mimetype for "<< baseUrl<< ":" << e.what() << endl;
contentType = "application/octet-stream";
}
/* Get the data */ /* Get the data */
content = string(article.getData().data(), article.getArticleSize()); content = string(article.getData().data(), article.getArticleSize());
}
/* Try to set a stub HTML header/footer if necesssary */ /* Try to set a stub HTML header/footer if necesssary */
if (contentType.find("text/html") != string::npos && if (contentType.find("text/html") != string::npos &&