kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 19:38:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ small refactoring

Browse Source
This commit is contained in:
kelson42 2010-03-24 20:28:36 +00:00
parent 06eee41639
commit 05e491012d
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,23 +126,6 @@ static void appendToFirstOccurence(string &content, const string regex, const st
regfree(&regexp);
}
static char charFromHex(std::string a) {
std::istringstream Blat (a);
int Z;
Blat >> std::hex >> Z;
return char (Z);
}
static void unescapeUrl(string &url) {
std::string::size_type pos;
std::string hex;
while (std::string::npos != (pos = url.find('%'))) {
hex = url.substr(pos + 1, 2);
url.replace(pos, 3, 1, charFromHex(hex));
}
return;
}
static int accessHandlerCallback(void *cls,
struct MHD_Connection * connection,
const char * url,
@ -198,8 +181,7 @@ static int accessHandlerCallback(void *cls,
/* urlstr */
std::string urlStr = string(url);
unescapeUrl(urlStr);
/* Mutex Lock */
pthread_mutex_lock(&readerLock);
@ -208,7 +190,7 @@ static int accessHandlerCallback(void *cls,
cout << "Loading '" << urlStr << "'... " << endl;
try {
reader->getContent(urlStr, content, contentLength, mimeType);
reader->getContentByUrl(urlStr, content, contentLength, mimeType);
if (verboseFlag) {
cout << "content size: " << contentLength << endl;