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

+ change call of function appendToFirstOccurence() and replaceRegex()

Browse Source
small_fixes
kelson42 13 years ago
parent e0cf824188
commit 26dba8fe49
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File

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

@ -120,12 +120,12 @@ string urlEncode(const string &c) {
void introduceTaskbar(string &content, const string &humanReadableBookId) { void introduceTaskbar(string &content, const string &humanReadableBookId) {
pthread_mutex_lock(&resourceLock); pthread_mutex_lock(&resourceLock);
appendToFirstOccurence(content, "<head>", getResourceAsString("jqueryui/include.html.part")); content = appendToFirstOccurence(content, "<head>", getResourceAsString("jqueryui/include.html.part"));
appendToFirstOccurence(content, "<head>", "<style>" + content = appendToFirstOccurence(content, "<head>", "<style>" +
getResourceAsString("server/taskbar.css") + "</style>"); getResourceAsString("server/taskbar.css") + "</style>");
std::string HTMLDivRewrited = getResourceAsString("server/taskbar.html.part"); std::string HTMLDivRewrited = replaceRegex(getResourceAsString("server/taskbar.html.part"),
replaceRegex(HTMLDivRewrited, humanReadableBookId, "__CONTENT__"); humanReadableBookId, "__CONTENT__");
appendToFirstOccurence(content, "<body[^>]*>", HTMLDivRewrited); content = appendToFirstOccurence(content, "<body[^>]*>", HTMLDivRewrited);
pthread_mutex_unlock(&resourceLock); pthread_mutex_unlock(&resourceLock);
} }
@ -251,9 +251,9 @@ static int accessHandlerCallback(void *cls,
if (mimeType.find("text/html") != string::npos) { if (mimeType.find("text/html") != string::npos) {
/* 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 */
replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/", content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/",
"(href|src)(=[\"|\']/)([A-Z|\\-])/"); "(href|src)(=[\"|\']/)([A-Z|\\-])/");
replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/", content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/",
"(@import[ ]+)([\"|\']/)([A-Z|\\-])/"); "(@import[ ]+)([\"|\']/)([A-Z|\\-])/");
if (searcher != NULL) { if (searcher != NULL) {
@ -519,22 +519,8 @@ int main(int argc, char **argv) {
</table>"; </table>";
} }
} }
welcomeHTML = getResourceAsString("server/home.html.tmpl");
replaceRegex(welcomeHTML, welcomeBooksHtml, "__BOOKS__"); welcomeHTML = replaceRegex(getResourceAsString("server/home.html.tmpl"), welcomeBooksHtml, "__BOOKS__");
/*
welcomeHTML += "<p>";
welcomeHTML += "<h1><a href='/" + humanReadableId + "/'>" + currentBook.title + "</a>(" + currentBook.creator + "/" + currentBook.publisher + ")</h1>";
welcomeHTML += "<p>" + currentBook.description + "</p>";
welcomeHTML += "<p><ul>";
welcomeHTML += "<li>Number of articles: " + currentBook.articleCount + "</li>";
welcomeHTML += "<li>Number of pictures: " + currentBook.mediaCount + "</li>";
welcomeHTML += "</ul></p>";
welcomeHTML += "</p><hr/>";
}
}
welcomeHTML += "</body></html>";
*/
#ifndef _WIN32 #ifndef _WIN32
/* Fork if necessary */ /* Fork if necessary */

Write Preview
Loading…
Cancel
Save