From 26dba8fe494de80dd749aec3ea54bb6bd04074d8 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Thu, 28 Jun 2012 12:53:06 +0000 Subject: [PATCH] + change call of function appendToFirstOccurence() and replaceRegex() --- src/server/kiwix-serve.cpp | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp index d86784a..d82d65f 100644 --- a/src/server/kiwix-serve.cpp +++ b/src/server/kiwix-serve.cpp @@ -120,12 +120,12 @@ string urlEncode(const string &c) { void introduceTaskbar(string &content, const string &humanReadableBookId) { pthread_mutex_lock(&resourceLock); - appendToFirstOccurence(content, "", getResourceAsString("jqueryui/include.html.part")); - appendToFirstOccurence(content, "", ""); - std::string HTMLDivRewrited = getResourceAsString("server/taskbar.html.part"); - replaceRegex(HTMLDivRewrited, humanReadableBookId, "__CONTENT__"); - appendToFirstOccurence(content, "]*>", HTMLDivRewrited); + std::string HTMLDivRewrited = replaceRegex(getResourceAsString("server/taskbar.html.part"), + humanReadableBookId, "__CONTENT__"); + content = appendToFirstOccurence(content, "]*>", HTMLDivRewrited); pthread_mutex_unlock(&resourceLock); } @@ -251,9 +251,9 @@ static int accessHandlerCallback(void *cls, if (mimeType.find("text/html") != string::npos) { /* 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|\\-])/"); - replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/", + content = replaceRegex(content, "$1$2" + humanReadableBookId + "/$3/", "(@import[ ]+)([\"|\']/)([A-Z|\\-])/"); if (searcher != NULL) { @@ -518,23 +518,9 @@ int main(int argc, char **argv) { \ "; } - } - welcomeHTML = getResourceAsString("server/home.html.tmpl"); - replaceRegex(welcomeHTML, welcomeBooksHtml, "__BOOKS__"); - - /* - welcomeHTML += "

"; - welcomeHTML += "

" + currentBook.title + "(" + currentBook.creator + "/" + currentBook.publisher + ")

"; - welcomeHTML += "

" + currentBook.description + "

"; - welcomeHTML += "

    "; - welcomeHTML += "
  • Number of articles: " + currentBook.articleCount + "
    • "; - welcomeHTML += "
  • Number of pictures: " + currentBook.mediaCount + "
    • "; - welcomeHTML += "

"; - welcomeHTML += "

"; - } } - welcomeHTML += ""; - */ + + welcomeHTML = replaceRegex(getResourceAsString("server/home.html.tmpl"), welcomeBooksHtml, "__BOOKS__"); #ifndef _WIN32 /* Fork if necessary */