From 2cd537fd02f2a9b60579be5f0e74934cc930040b Mon Sep 17 00:00:00 2001
From: kelson42 <kelson42@users.sourceforge.net>
Date: Sun, 20 May 2012 10:53:00 +0000
Subject: [PATCH] + try to fix the problem with corrupted resources on arm
 kiwix-serve

---
 src/common/resourceTools.cpp |  4 ++--
 src/common/resourceTools.h   | 22 +++++++++++-----------
 static/buildResourceCode.sh  |  8 ++++----
 static/server/home.html.tmpl |  1 -
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/common/resourceTools.cpp b/src/common/resourceTools.cpp
index 05c36a433..c8946b152 100644
--- a/src/common/resourceTools.cpp
+++ b/src/common/resourceTools.cpp
@@ -2,9 +2,9 @@
 #include <iostream>
 
 std::string getResourceAsString(const std::string &name) {
-  std::map<std::string, const char*>::iterator it = resourceMap.find(name);
+  std::map<std::string, std::pair<const unsigned char*, unsigned int> >::iterator it = resourceMap.find(name);
   if (it != resourceMap.end()) {
-    return std::string(strdup(resourceMap[name]));
+    return std::string(strdup((const char*)resourceMap[name].first), resourceMap[name].second);
   }
   return "";
 }
diff --git a/src/common/resourceTools.h b/src/common/resourceTools.h
index 5c7044a11..46ce83931 100644
--- a/src/common/resourceTools.h
+++ b/src/common/resourceTools.h
@@ -21206,20 +21206,20 @@ const unsigned char server_taskbar_html_part[]={
   0x3a,0x20,0x34,0x30,0x70,0x78,0x3b,0x22,0x3e,0x3c,0x2f,0x64,0x69,0x76,0x3e,0x0a
   };
 
-static std::map<std::string, const char*> createResourceMap() { 
-	std::map<std::string, const char*> m; 
-	m["results.tmpl"] = (const char*)results_tmpl; 
-	m["jqueryui/include.html.part"] = (const char*)jqueryui_include_html_part; 
-	m["jqueryui/css/smoothness/jquery-ui.custom.css"] = (const char*)jqueryui_css_smoothness_jquery_ui_custom_css; 
-	m["jqueryui/js/jquery-ui.custom.min.js"] = (const char*)jqueryui_js_jquery_ui_custom_min_js; 
-	m["jqueryui/js/jquery.min.js"] = (const char*)jqueryui_js_jquery_min_js; 
-	m["server/taskbar.css"] = (const char*)server_taskbar_css; 
-	m["server/home.html.tmpl"] = (const char*)server_home_html_tmpl; 
-	m["server/taskbar.html.part"] = (const char*)server_taskbar_html_part; 
+static std::map<std::string, std::pair<const unsigned char*, unsigned int> > createResourceMap() { 
+	std::map<std::string, std::pair<const unsigned char*, unsigned int> > m; 
+	m["results.tmpl"] = std::pair <const unsigned char*, unsigned int>(results_tmpl, sizeof results_tmpl); 
+	m["jqueryui/include.html.part"] = std::pair <const unsigned char*, unsigned int>(jqueryui_include_html_part, sizeof jqueryui_include_html_part); 
+	m["jqueryui/css/smoothness/jquery-ui.custom.css"] = std::pair <const unsigned char*, unsigned int>(jqueryui_css_smoothness_jquery_ui_custom_css, sizeof jqueryui_css_smoothness_jquery_ui_custom_css); 
+	m["jqueryui/js/jquery-ui.custom.min.js"] = std::pair <const unsigned char*, unsigned int>(jqueryui_js_jquery_ui_custom_min_js, sizeof jqueryui_js_jquery_ui_custom_min_js); 
+	m["jqueryui/js/jquery.min.js"] = std::pair <const unsigned char*, unsigned int>(jqueryui_js_jquery_min_js, sizeof jqueryui_js_jquery_min_js); 
+	m["server/taskbar.css"] = std::pair <const unsigned char*, unsigned int>(server_taskbar_css, sizeof server_taskbar_css); 
+	m["server/home.html.tmpl"] = std::pair <const unsigned char*, unsigned int>(server_home_html_tmpl, sizeof server_home_html_tmpl); 
+	m["server/taskbar.html.part"] = std::pair <const unsigned char*, unsigned int>(server_taskbar_html_part, sizeof server_taskbar_html_part); 
 	return m; 
 } 
 
-static std::map<std::string, const char*> resourceMap = createResourceMap(); 
+static std::map<std::string, std::pair<const unsigned char*, unsigned int> > resourceMap = createResourceMap(); 
 
 
 #endif
diff --git a/static/buildResourceCode.sh b/static/buildResourceCode.sh
index 523c5f567..419ecb83b 100755
--- a/static/buildResourceCode.sh
+++ b/static/buildResourceCode.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 SCRIPT_DIR=$(dirname $0)
 RESOURCE_FILE=$SCRIPT_DIR/../src/common/resourceTools.h
-MAP="static std::map<std::string, const char*> createResourceMap() { \n"
-MAP=$MAP"\tstd::map<std::string, const char*> m; \n"
+MAP="static std::map<std::string, std::pair<const unsigned char*, unsigned int> > createResourceMap() { \n"
+MAP=$MAP"\tstd::map<std::string, std::pair<const unsigned char*, unsigned int> > m; \n"
 
 # Delete old version of the file
 rm -f "$RESOURCE_FILE"
@@ -26,11 +26,11 @@ do
     FILE_ID=`echo "$FILE" | sed "s/\//_/g" | sed "s/\./_/g" | sed "s/\-/_/g"`
     echo "Inserting $FILE... [$FILE_ID]"
     reswrap -s -x -oa $RESOURCE_FILE -r $FILE_ID $FILE
-    MAP=$MAP"\tm[\""$FILE"\"] = (const char*)"$FILE_ID"; \n"; 
+    MAP=$MAP"\tm[\""$FILE"\"] = std::pair <const unsigned char*, unsigned int>("$FILE_ID", sizeof "$FILE_ID"); \n"; 
 done;
 MAP=$MAP"\treturn m; \n";
 MAP=$MAP"} \n\n"
-MAP=$MAP"static std::map<std::string, const char*> resourceMap = createResourceMap(); \n\n"
+MAP=$MAP"static std::map<std::string, std::pair<const unsigned char*, unsigned int> > resourceMap = createResourceMap(); \n\n"
 
 # Create the map table 
 # map<int, int> m = map_list_of (1,2) (3,4) (5,6) (7,8);
diff --git a/static/server/home.html.tmpl b/static/server/home.html.tmpl
index b1a7714ca..5647c2bb5 100644
--- a/static/server/home.html.tmpl
+++ b/static/server/home.html.tmpl
@@ -16,6 +16,5 @@ $( "#accordion" ).accordion();
 <div id="accordion">
   __BOOKS__
 </div>
-
 </body>
 </html>