navit-cvs-commit Mailing List for Navit (Page 16)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5756
          http://sourceforge.net/p/navit/code/5756
Author:   sleske
Date:     2014-03-21 22:41:14 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Refactor:gui_internal:Reorder code in gui_internal_search_idle; remove redundant code; better logging.

Modified Paths:
--------------
    trunk/navit/navit/gui/internal/gui_internal_search.c

Modified: trunk/navit/navit/gui/internal/gui_internal_search.c
===================================================================

--- trunk/navit/navit/gui/internal/gui_internal_search.c	2014-03-21 22:41:01 UTC (rev 5755)
+++ trunk/navit/navit/gui/internal/gui_internal_search.c	2014-03-21 22:41:14 UTC (rev 5756)
@@ -188,37 +188,30 @@
 }
 
 static void
-gui_internal_find_next_possible_key(struct widget *wi, char *wm_name, struct search_list_result *res, char *possible_keys, char *name)
+gui_internal_find_next_possible_key(char *search_text, char *wm_name, char *possible_keys, char *item_name)
 {
-	gchar* trunk_name = NULL;
-	if (! strcmp(wm_name,"Town"))
-		trunk_name = g_strrstr(res->town->common.town_name, wi->text);
-	if (! strcmp(wm_name,"Street"))
+	gchar* trunk_name;
+	if (((! strcmp(wm_name,"Town")) || (! strcmp(wm_name,"Street"))) && item_name)
 	{
-		name=res->street->name;
-		if (name)
-			trunk_name = g_strrstr(name, wi->text);
-		else
-			trunk_name = NULL;
-	}
-
-	if (trunk_name) {
-		char next_char = trunk_name[strlen(wi->text)];
-		int i;
-		int len = strlen(possible_keys);
-		for(i = 0; (i<len) && (possible_keys[i] != next_char) ;i++) ;
-		if (i==len || !len) {
-			possible_keys[len]=trunk_name[strlen(wi->text)];
-			possible_keys[len+1]='\0';
+		trunk_name = g_strrstr(item_name, search_text);
+		if (trunk_name) {
+			char next_char = trunk_name[strlen(search_text)];
+			int i;
+			int len = strlen(possible_keys);
+			for(i = 0; (i<len) && (possible_keys[i] != next_char) ;i++) ;
+			if (i==len || !len) {
+				possible_keys[len]=trunk_name[strlen(search_text)];
+				possible_keys[len+1]='\0';
+			}
+			dbg(2,"searching for %s, found: %s, currently possible_keys: %s \n", search_text, item_name, possible_keys);
 		}
-		dbg(1,"%s %s possible_keys:%s \n", wi->text, res->town->common.town_name, possible_keys);
 	}
 }
 
 static void
 gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *search_list, void *param)
 {
-	char *text=NULL,*text2=NULL,*name=NULL, *wcname=NULL;
+	char *text=NULL,*text2=NULL,*item_name=NULL, *wcname=NULL;
 	struct search_list_result *res;
 	struct widget *wc;
 	struct item *item=NULL;
@@ -229,10 +222,39 @@
 
 	res=search_list_get_result(this->sl);
 	if (res) {
+		if (! strcmp(wm_name,"Country")) {
+			item_name=res->country->name;
+			item=&res->country->common.item;
+			text=g_strdup_printf("%s", res->country->name);
+		}
+		if (! strcmp(wm_name,"Town")) {
+			item=&res->town->common.item;
+			item_name=res->town->common.town_name;
+			text=town_str(res, 1, 0);
+			text2=town_str(res, 1, 2);
+		}
+		if (! strcmp(wm_name,"Street")) {
+			item_name=res->street->name;
+			item=&res->street->common.item;
+			text=g_strdup(res->street->name);
+			text2=town_str(res, 2, 1);
+		}
+		if (! strcmp(wm_name,"House number")) {
+			item_name=res->house_number->house_number;
+			text=g_strdup_printf("%s, %s", item_name, res->street->name);
+			text2=town_str(res, 3, 0);
+			wcname=g_strdup(text);
+		}
+
+		if(!wcname)
+			wcname=g_strdup(item_name);
+
+		dbg(1,"res->country->flag=%s\n", res->country->flag);
+
 		struct widget *menu=g_list_last(this->root.children)->data;
 		wi=gui_internal_find_widget(menu, NULL, STATE_EDIT);
 		dbg_assert(wi);
-		gui_internal_find_next_possible_key(wi, wm_name, res, possible_keys, name);
+		gui_internal_find_next_possible_key(wi->text, wm_name, possible_keys, item_name);
 	} else {
 		struct menu_data *md;
 		gui_internal_search_idle_end(this);
@@ -268,46 +290,18 @@
 		return;
 	}
 
-	if (! strcmp(wm_name,"Country")) {
-		name=res->country->name;
-		item=&res->country->common.item;
-		text=g_strdup_printf("%s", res->country->name);
-	}
-	if (! strcmp(wm_name,"Town")) {
-		item=&res->town->common.item;
-		name=res->town->common.town_name;
-		text=town_str(res, 1, 0);
-		text2=town_str(res, 1, 2);
-	}
-	if (! strcmp(wm_name,"Street")) {
-		name=res->street->name;
-		item=&res->street->common.item;
-		text=g_strdup(res->street->name);
-		text2=town_str(res, 2, 1);
-	}
-	if (! strcmp(wm_name,"House number")) {
-		name=res->house_number->house_number;
-		text=g_strdup_printf("%s, %s", name, res->street->name);
-		text2=town_str(res, 3, 0);
-		wcname=g_strdup(text);
-	}
-
-	if(!wcname)
-		wcname=g_strdup(name);
-
-	dbg(1,"res->country->flag=%s\n", res->country->flag);
 	wr=gui_internal_widget_table_row_new(this, gravity_left|orientation_horizontal|flags_fill);
 
 	if (!text2)
 		wr->text=g_strdup(text);
 	else
-		wr->text=g_strdup_printf("%s %s",name,text2);
+		wr->text=g_strdup_printf("%s %s",item_name,text2);
 	
 	if (! strcmp(wm_name,"House number") && !res->street->name) {
 		wr->datai=2048;
-	} else if(name) {
+	} else if(item_name) {
 		int i;
-		char *folded_name=linguistics_casefold(name);
+		char *folded_name=linguistics_casefold(item_name);
 		char *folded_query=linguistics_casefold(wi->text);
 		wr->datai=1024;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2007	Jan	Feb	Mar	Apr	May	Jun	Jul (4)	Aug (59)	Sep (43)	Oct (95)	Nov (135)	Dec (108)
2008	Jan (229)	Feb (141)	Mar (59)	Apr (70)	May (64)	Jun (87)	Jul (57)	Aug (108)	Sep (74)	Oct (203)	Nov (141)	Dec (108)
2009	Jan (114)	Feb (91)	Mar (101)	Apr (69)	May (54)	Jun (82)	Jul (49)	Aug (109)	Sep (81)	Oct (93)	Nov (100)	Dec (79)
2010	Jan (46)	Feb (36)	Mar (135)	Apr (103)	May (116)	Jun (130)	Jul (52)	Aug (31)	Sep (46)	Oct (48)	Nov (98)	Dec (110)
2011	Jan (234)	Feb (184)	Mar (150)	Apr (43)	May (53)	Jun (52)	Jul (112)	Aug (72)	Sep (79)	Oct (23)	Nov (6)	Dec (30)
2012	Jan (39)	Feb (37)	Mar (49)	Apr (60)	May (63)	Jun (38)	Jul (33)	Aug (24)	Sep (20)	Oct (14)	Nov (23)	Dec (50)
2013	Jan (30)	Feb (32)	Mar (27)	Apr (41)	May (59)	Jun (21)	Jul (10)	Aug (73)	Sep (23)	Oct (60)	Nov (14)	Dec (15)
2014	Jan (4)	Feb (8)	Mar (11)	Apr (6)	May (27)	Jun (4)	Jul (29)	Aug (62)	Sep (11)	Oct (17)	Nov (58)	Dec (9)
2015	Jan (23)	Feb (3)	Mar (26)	Apr (47)	May (8)	Jun (28)	Jul (10)	Aug (3)	Sep	Oct	Nov	Dec

navit-cvs-commit Mailing List for Navit (Page 16)

navit-cvs-commit — CVS commit mailing list