Sapian
/
kiwix-tools
forked from kiwix/kiwix-tools
3
0
Fork 0
Code Releases Activity

merged with master on zimAccessor/VMStringLoader/configure.ac

Browse Source
small_fixes
rgaudin 12 years ago
parent 11d9784820 e1e163ffe4
commit 74b6d357d7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File

7
src/server/kiwix-serve.cpp
Unescape View File

@ -273,8 +273,10 @@ static int accessHandlerCallback(void *cls,
/* 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); pthread_mutex_lock(&readerLock);
std::string baseUrl;
try { try {
found = reader->getContentByDecodedUrl(urlStr, content, contentLength, mimeType); found = reader->getContentByDecodedUrl(urlStr, content, contentLength, mimeType, baseUrl);
if (found) { if (found) {
if (isVerbose()) { if (isVerbose()) {
cout << "Found " << urlStr << endl; cout << "Found " << urlStr << endl;
@ -300,6 +302,9 @@ static int accessHandlerCallback(void *cls,
"(href|src)(=[\"|\']{0,1}/)([A-Z|\\-])/"); "(href|src)(=[\"|\']{0,1}/)([A-Z|\\-])/");
content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/", content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/",
"(@import[ ]+)([\"|\']{0,1}/)([A-Z|\\-])/"); "(@import[ ]+)([\"|\']{0,1}/)([A-Z|\\-])/");
content = replaceRegex(content,
"<head><base href=\"/" + humanReadableBookId + baseUrl + "\" />",
"<head>");
} else if (mimeType.find("text/css") != string::npos) { } else if (mimeType.find("text/css") != string::npos) {
content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/", content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/",
"(url|URL)(\\([\"|\']{0,1}/)([A-Z|\\-])/"); "(url|URL)(\\([\"|\']{0,1}/)([A-Z|\\-])/");

Write Preview
Loading…
Cancel
Save