From 05e491012d4ef3ddcb465698f41a5daed24be3d5 Mon Sep 17 00:00:00 2001
From: kelson42 <kelson42@users.sourceforge.net>
Date: Wed, 24 Mar 2010 20:28:36 +0000
Subject: [PATCH] + small refactoring

---
 src/server/kiwix-serve.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index 9dc89c1..82f1207 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -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;