From 6486cc7f356eea0ab52f71abc6806f4d735984bf Mon Sep 17 00:00:00 2001
From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sun, 30 Mar 2008 20:33:32 +0000
Subject: [PATCH] Fix:Tools:Added processing of entities, fixed wrong country
 id for nl

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@966 ffa7fe5e-494d-0410-b361-a75ebd5db220
---
 navit/src/osm2navit.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/navit/src/osm2navit.c b/navit/src/osm2navit.c
index b555e07..c004d44 100644
--- a/navit/src/osm2navit.c
+++ b/navit/src/osm2navit.c
@@ -199,7 +199,7 @@ struct country_table {
 } country_table[] = {
 	{ 40,"Austria,Österreich,AUT"},
 	{276,"Germany,Deutschland,Bundesrepublik Deutschland"},
-	{518,"Nederland,The Netherlands,Niederlande,NL"},
+	{528,"Nederland,The Netherlands,Niederlande,NL"},
 };
 
 static GHashTable *country_table_hash;
@@ -524,6 +524,38 @@ add_tag(char *k, char *v)
 		attr_present[idx]=4;
 }
 
+struct entity {
+	char *entity;
+	char c;
+} entities[]= {
+	{"&qout;",'"'},
+	{"&apos;",'\''},
+	{"&amp;",'&'},
+	{"&lt;",'<'},
+	{"&gt;",'>'},
+};
+
+static void
+decode_entities(char *buffer)
+{
+	char *pos=buffer;
+	int i,len,found;
+
+	while ((pos=strchr(pos, '&'))) {
+		found=0;
+		for (i = 0 ; i < sizeof(entities)/sizeof(struct entity); i++) {
+			len=strlen(entities[i].entity);
+			if (!strncmp(pos, entities[i].entity, len)) {
+				*pos=entities[i].c;
+			 	memmove(pos+1, pos+len, strlen(pos+len)+1);
+				found=1;
+				break;
+			}
+		}
+		pos++;
+	}
+}
+
 static int
 parse_tag(char *p)
 {
@@ -533,6 +565,7 @@ parse_tag(char *p)
 		return 0;
 	if (!xml_get_attribute(p, "v", v_buffer, BUFFER_SIZE))
 		return 0;
+	decode_entities(v_buffer);
 	add_tag(k_buffer, v_buffer);
 	return 1;
 }
-- 
2.7.4