From 041d7c086317e8fc684bea5af0f7fbe36039debc Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sat, 28 Apr 2012 16:01:27 +0000 Subject: [PATCH] + move splitString.[h|cpp] to stringTools.[h|cpp] --- src/server/Makefile.am.alt | 4 ++-- src/server/Makefile.am.orig | 4 ++-- src/server/Makefile.mvsc | 2 +- src/server/kiwix-serve.cpp | 28 ++++++++++++++++++++++++---- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt index f6054f1..9ff3272 100644 --- a/src/server/Makefile.am.alt +++ b/src/server/Makefile.am.alt @@ -13,7 +13,7 @@ kiwix_serve_SOURCES= \ ../common/pathTools.cpp \ ../common/regexTools.cpp \ ../common/resourceTools.cpp \ - ../common/splitString.cpp + ../common/stringTools.cpp include_HEADERS= \ ../common/kiwix/reader.h \ ../common/kiwix/searcher.h \ @@ -26,7 +26,7 @@ include_HEADERS= \ ../common/pathTools.h \ ../common/regexTools.h \ ../common/resourceTools.h \ - ../common/splitString.h + ../common/stringTools.h kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/ kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a diff --git a/src/server/Makefile.am.orig b/src/server/Makefile.am.orig index d1b7e35..5a29a2d 100644 --- a/src/server/Makefile.am.orig +++ b/src/server/Makefile.am.orig @@ -13,7 +13,7 @@ kiwix_serve_SOURCES= \ ../common/pathTools.cpp \ ../common/regexTools.cpp \ ../common/resourceTools.cpp \ - ../common/splitString.cpp + ../common/stringTools.cpp include_HEADERS= \ ../common/kiwix/reader.h \ ../common/kiwix/searcher.h \ @@ -26,7 +26,7 @@ include_HEADERS= \ ../common/pathTools.h \ ../common/regexTools.h \ ../common/resourceTools.h \ - ../common/splitString.h + ../common/stringTools.h kiwix_serve_CXXFLAGS=${LIBMICROHTTPD_CFLAGS} $(LIBPUGIXML_CFLAGS) $(LIBCTPP2_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBXAPIAN_CFLAGS) $(LIBICU_CFLAGS) $(LIBZIM_CFLAGS) -I../common/ if IS_STATIC kiwix_serve_LDFLAGS= -ldl -lm -lpthread -luuid ${LIBMICROHTTPD_STATIC_LDFLAGS} ${LIBPUGIXML_STATIC_LDFLAGS} $(LIBCTPP2_STATIC_LDFLAGS) $(LIBCLUCENE_STATIC_LDFLAGS) $(LIBXAPIAN_STATIC_LDFLAGS) $(LIBICU_STATIC_LDFLAGS) $(LIBZIMSELF_STATIC_LDFLAGS) $(LIBLZMA_STATIC_LDFLAGS) $(LIBZ_STATIC_LDFLAGS) diff --git a/src/server/Makefile.mvsc b/src/server/Makefile.mvsc index bce3d8e..0998535 100644 --- a/src/server/Makefile.mvsc +++ b/src/server/Makefile.mvsc @@ -44,7 +44,7 @@ argtableobjs: $(CC) $(CFLAGS) -D"MHD_PLATFORM_H" -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" kiwix-serve.cpp objs: - $(CC) $(CFLAGS) ../common/kiwix/reader.cpp ../common/kiwix/searcher.cpp ../common/kiwix/xapianSearcher.cpp ../common/unaccent.cpp ../common/splitString.cpp ../common/regexTools.cpp ../common/pathTools.cpp + $(CC) $(CFLAGS) ../common/kiwix/reader.cpp ../common/kiwix/searcher.cpp ../common/kiwix/xapianSearcher.cpp ../common/unaccent.cpp ../common/stringTools.cpp ../common/regexTools.cpp ../common/pathTools.cpp kiwix-serve.exe: argtableobjs objs $(LD) -OUT:"kiwix-serve.exe" -NOLOGO $(LDFLAGS) -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib argtable2.lib pugixml.lib libmicrohttpd.dll.a ctpp2.lib libcommon.lib libbackend.lib libbrass.lib Rpcrt4.lib libbrassbtreecheck.lib libbrassbtreecheck.lib libexpand.lib libflint.lib libflintbtreecheck.lib libchert.lib libweight.lib libinmemory.lib libmulti.lib libmatcher.lib libnet.lib liblanguages.lib libapi.lib libremote.lib libunicode.lib libqueryparser.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib pthreadVC2.lib zlib.lib *.obj diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp index 1a52be5..27d441a 100644 --- a/src/server/kiwix-serve.cpp +++ b/src/server/kiwix-serve.cpp @@ -58,7 +58,7 @@ typedef int off_t; #include #include #include -#include +#include #include using namespace std; @@ -491,12 +491,31 @@ int main(int argc, char **argv) { } /* Compute the Welcome HTML */ - welcomeHTML = "Welcome to Kiwix Server"; + string welcomeBooksHtml; for ( itr = booksIds.begin(); itr != booksIds.end(); ++itr ) { libraryManager.getBookById(*itr, currentBook); - string humanReadableId = currentBook.getHumanReadableIdFromPath(); - if (!currentBook.path.empty()) { + welcomeBooksHtml += "

" + currentBook.title + "

\ + \ + \ + \ + \ +
icon" + currentBook.description + + "" + + " \ + \ + \ +
Size: " + "" + + "Created:
Author:Language:
Publisher:
\ +
\ + \ +
"; + } + } + welcomeHTML = getResourceAsString("server/home.html.tmpl"); + replaceRegex(welcomeHTML, welcomeBooksHtml, "__BOOKS__"); + + /* welcomeHTML += "

"; welcomeHTML += "

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

"; welcomeHTML += "

" + currentBook.description + "

"; @@ -508,6 +527,7 @@ int main(int argc, char **argv) { } } welcomeHTML += ""; + */ #ifndef _WIN32 /* Fork if necessary */