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

+ move splitString.[h|cpp] to stringTools.[h|cpp]

Browse Source
small_fixes
kelson42 14 years ago
parent 846405d5d9
commit 041d7c0863
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
src/server/Makefile.am.alt
Unescape View File

@ -13,7 +13,7 @@ kiwix_serve_SOURCES= \
../common/pathTools.cpp \ ../common/pathTools.cpp \
../common/regexTools.cpp \ ../common/regexTools.cpp \
../common/resourceTools.cpp \ ../common/resourceTools.cpp \
../common/splitString.cpp ../common/stringTools.cpp
include_HEADERS= \ include_HEADERS= \
../common/kiwix/reader.h \ ../common/kiwix/reader.h \
../common/kiwix/searcher.h \ ../common/kiwix/searcher.h \
@ -26,7 +26,7 @@ include_HEADERS= \
../common/pathTools.h \ ../common/pathTools.h \
../common/regexTools.h \ ../common/regexTools.h \
../common/resourceTools.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_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 kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a

4
src/server/Makefile.am.orig
Unescape View File

@ -13,7 +13,7 @@ kiwix_serve_SOURCES= \
../common/pathTools.cpp \ ../common/pathTools.cpp \
../common/regexTools.cpp \ ../common/regexTools.cpp \
../common/resourceTools.cpp \ ../common/resourceTools.cpp \
../common/splitString.cpp ../common/stringTools.cpp
include_HEADERS= \ include_HEADERS= \
../common/kiwix/reader.h \ ../common/kiwix/reader.h \
../common/kiwix/searcher.h \ ../common/kiwix/searcher.h \
@ -26,7 +26,7 @@ include_HEADERS= \
../common/pathTools.h \ ../common/pathTools.h \
../common/regexTools.h \ ../common/regexTools.h \
../common/resourceTools.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/ kiwix_serve_CXXFLAGS=${LIBMICROHTTPD_CFLAGS} $(LIBPUGIXML_CFLAGS) $(LIBCTPP2_CFLAGS) $(LIBCLUCENE_CFLAGS) $(LIBXAPIAN_CFLAGS) $(LIBICU_CFLAGS) $(LIBZIM_CFLAGS) -I../common/
if IS_STATIC 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) 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)

2
src/server/Makefile.mvsc
Unescape View File

@ -44,7 +44,7 @@ argtableobjs:
$(CC) $(CFLAGS) -D"MHD_PLATFORM_H" -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" kiwix-serve.cpp $(CC) $(CFLAGS) -D"MHD_PLATFORM_H" -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" kiwix-serve.cpp
objs: 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 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 $(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

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

@ -58,7 +58,7 @@ typedef int off_t;
#include <kiwix/xapianSearcher.h> #include <kiwix/xapianSearcher.h>
#include <pathTools.h> #include <pathTools.h>
#include <regexTools.h> #include <regexTools.h>
#include <splitString.h> #include <stringTools.h>
#include <resourceTools.h> #include <resourceTools.h>
using namespace std; using namespace std;
@ -491,12 +491,31 @@ int main(int argc, char **argv) {
} }
/* Compute the Welcome HTML */ /* Compute the Welcome HTML */
welcomeHTML = "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><title>Welcome to Kiwix Server</title></head><body>"; string welcomeBooksHtml;
for ( itr = booksIds.begin(); itr != booksIds.end(); ++itr ) { for ( itr = booksIds.begin(); itr != booksIds.end(); ++itr ) {
libraryManager.getBookById(*itr, currentBook); libraryManager.getBookById(*itr, currentBook);
string humanReadableId = currentBook.getHumanReadableIdFromPath();
if (!currentBook.path.empty()) { if (!currentBook.path.empty()) {
welcomeBooksHtml += "<h3><a href=\"#\">" + currentBook.title + "</a></h3> \
<table style=\"width: 100%;\"><tr> \
<td>icon</td> \
<td style=\"width: 100%;\">" + currentBook.description +
"<table style=\"font-size: small; color: grey;\">" +
"<tr><td>Size: " + "" +
"</td><td>Created:</td></tr> \
<tr><td>Author:</td><td>Language:</td></tr> \
<tr><td>Publisher:</td><td></td></tr> \
</table> \
</td></tr> \
<tr><td colspan=\"2\" style=\"align: right; right: 0px;\"> \
<button style=\"align: right; right: 0px; float:right;\" onclick=\"window.location.href=\"/" + currentBook.getHumanReadableIdFromPath() + "/\">Load</button> \
</td></tr> \
</table>";
}
}
welcomeHTML = getResourceAsString("server/home.html.tmpl");
replaceRegex(welcomeHTML, welcomeBooksHtml, "__BOOKS__");
/*
welcomeHTML += "<p>"; welcomeHTML += "<p>";
welcomeHTML += "<h1><a href='/" + humanReadableId + "/'>" + currentBook.title + "</a>(" + currentBook.creator + "/" + currentBook.publisher + ")</h1>"; welcomeHTML += "<h1><a href='/" + humanReadableId + "/'>" + currentBook.title + "</a>(" + currentBook.creator + "/" + currentBook.publisher + ")</h1>";
welcomeHTML += "<p>" + currentBook.description + "</p>"; welcomeHTML += "<p>" + currentBook.description + "</p>";
@ -508,6 +527,7 @@ int main(int argc, char **argv) {
} }
} }
welcomeHTML += "</body></html>"; welcomeHTML += "</body></html>";
*/
#ifndef _WIN32 #ifndef _WIN32
/* Fork if necessary */ /* Fork if necessary */

Write Preview
Loading…
Cancel
Save