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

+ show introducetaskbar everytime (now we have the suggestions)

Browse Source
This commit is contained in:
kelson42 2012-08-15 15:44:44 +00:00
parent 38dbceeb50
commit 284085e3e1
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,9 +247,8 @@ static int accessHandlerCallback(void *cls,
if (end != NULL) if (end != NULL)
endNumber = atoi(end); endNumber = atoi(end);
if (pattern == NULL) { if (pattern == NULL)
pattern = ""; pattern = "";
}
/* Get the results */ /* Get the results */
pthread_mutex_lock(&searcherLock); pthread_mutex_lock(&searcherLock);
@ -263,7 +262,6 @@ static int accessHandlerCallback(void *cls,
pthread_mutex_unlock(&searcherLock); pthread_mutex_unlock(&searcherLock);
mimeType = "text/html; charset=utf-8"; mimeType = "text/html; charset=utf-8";
introduceTaskbar(content, humanReadableBookId);
} }
/* Display the content of a ZIM article */ /* Display the content of a ZIM article */
@ -299,10 +297,6 @@ static int accessHandlerCallback(void *cls,
"(href|src)(=[\"|\']/)([A-Z|\\-])/"); "(href|src)(=[\"|\']/)([A-Z|\\-])/");
content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/", content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/",
"(@import[ ]+)([\"|\']/)([A-Z|\\-])/"); "(@import[ ]+)([\"|\']/)([A-Z|\\-])/");
if (searcher != NULL) {
introduceTaskbar(content, humanReadableBookId);
}
} }
} }
@ -313,6 +307,11 @@ static int accessHandlerCallback(void *cls,
mimeType = "text/html; charset=utf-8"; mimeType = "text/html; charset=utf-8";
pthread_mutex_unlock(&welcomeLock); pthread_mutex_unlock(&welcomeLock);
} }
/* Introduce Taskbar */
if (!humanReadableBookId.empty() && mimeType.find("text/html") != string::npos) {
introduceTaskbar(content, humanReadableBookId);
}
/* Compute the lengh */ /* Compute the lengh */
contentLength = content.size(); contentLength = content.size();