kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-23 12:00:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small beautifications

Browse Source
This commit is contained in:
kelson42 2014-08-28 14:55:11 -06:00
parent 9df7b9fb12
commit b2d7316f8b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/kiwix-serve.cpp
View File

@ -298,7 +298,7 @@ static int accessHandlerCallback(void *cls,
/* If article found then redirect directly to it */ /* If article found then redirect directly to it */
if (!patternCorrespondingUrl.empty()) { if (!patternCorrespondingUrl.empty()) {
httpRedirection="/" + humanReadableBookId + "/" + patternCorrespondingUrl; httpRedirection = "/" + humanReadableBookId + "/" + patternCorrespondingUrl;
} }
} }
@ -335,17 +335,19 @@ static int accessHandlerCallback(void *cls,
pthread_mutex_lock(&readerLock); pthread_mutex_lock(&readerLock);
randomUrl = reader->getRandomPageUrl(); randomUrl = reader->getRandomPageUrl();
pthread_mutex_unlock(&readerLock); pthread_mutex_unlock(&readerLock);
httpRedirection="/" + humanReadableBookId + "/" + randomUrl; httpRedirection = "/" + humanReadableBookId + "/" + randomUrl;
} }
} }
/* Display the content of a ZIM article */ /* Display the content of a ZIM article */
else if (reader != NULL) { else if (reader != NULL) {
pthread_mutex_lock(&readerLock);
std::string baseUrl; std::string baseUrl;
try { try {
pthread_mutex_lock(&readerLock);
found = reader->getContentByDecodedUrl(urlStr, content, contentLength, mimeType, baseUrl); found = reader->getContentByDecodedUrl(urlStr, content, contentLength, mimeType, baseUrl);
pthread_mutex_unlock(&readerLock);
if (found) { if (found) {
if (isVerbose()) { if (isVerbose()) {
cout << "Found " << urlStr << endl; cout << "Found " << urlStr << endl;
@ -355,15 +357,14 @@ static int accessHandlerCallback(void *cls,
} else { } else {
if (isVerbose()) if (isVerbose())
cout << "Failed to find " << urlStr << endl; cout << "Failed to find " << urlStr << endl;
content = "<!DOCTYPE html>\n<html><head><meta content=\"text/html;charset=UTF-8\" http-equiv=\"content-type\" /><title>Content not found</title></head><body><h1>Not Found</h1><p>The requested URL " + urlStr + " was not found on this server.</p></body></html>"; content = "<!DOCTYPE html>\n<html><head><meta content=\"text/html;charset=UTF-8\" http-equiv=\"content-type\" /><title>Content not found</title></head><body><h1>Not Found</h1><p>The requested URL \"" + urlStr + "\" was not found on this server.</p></body></html>";
mimeType = "text/html"; mimeType = "text/html";
httpResponseCode = MHD_HTTP_NOT_FOUND; httpResponseCode = MHD_HTTP_NOT_FOUND;
} }
} catch (const std::exception& e) { } catch (const std::exception& e) {
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
} }
pthread_mutex_unlock(&readerLock);
/* Special rewrite URL in case of ZIM file use intern *asbolute* url like /A/Kiwix */ /* Special rewrite URL in case of ZIM file use intern *asbolute* url like /A/Kiwix */
if (mimeType.find("text/html") != string::npos) { if (mimeType.find("text/html") != string::npos) {