/[zanavi_public1]/navit/navit/search.c
ZANavi

Diff of /navit/navit/search.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 48 Revision 49
1080 int search_radius_this; 1080 int search_radius_this;
1081 int search_order; 1081 int search_order;
1082 struct attr att; 1082 struct attr att;
1083 struct attr att2; 1083 struct attr att2;
1084 struct attr debug_att2; 1084 struct attr debug_att2;
1085 char *town_string2; 1085 char *town_string2 = NULL;
1086 char *hn_fold = NULL; 1086 char *hn_fold = NULL;
1087 char *street_name_fold = NULL; 1087 char *street_name_fold = NULL;
1088 int search_results_found_ = 0; 1088 int search_results_found_ = 0;
1089 int max_townname_plus_1 = MAX_INDEXSEARCH_TOWNNAME + 1; 1089 int max_townname_plus_1 = MAX_INDEXSEARCH_TOWNNAME + 1;
1090 1090
1133 g_free(street_name_fold); 1133 g_free(street_name_fold);
1134 } 1134 }
1135 return; 1135 return;
1136 } 1136 }
1137 1137
1138 //dbg(0, "SEARCH:HM:010a:townstr=%p", town_string);
1139 if (town_string)
1140 {
1141 //dbg(0, "SEARCH:HM:010b:townstr=%s", town_string);
1142
1138 if (strlen(town_string) > MAX_INDEXSEARCH_TOWNNAME) 1143 if (strlen(town_string) > MAX_INDEXSEARCH_TOWNNAME)
1139 { 1144 {
1140 town_string2 = town_string; 1145 town_string2 = town_string;
1141 town_string2[max_townname_plus_1] = '\0'; 1146 town_string2[max_townname_plus_1] = '\0';
1142 town_string2 = linguistics_check_utf8_string(town_string2); 1147 town_string2 = linguistics_check_utf8_string(town_string2);
1143 } 1148 }
1144 else 1149 else
1145 { 1150 {
1146 town_string2 = town_string; 1151 town_string2 = town_string;
1147 } 1152 }
1148 1153 }
1149 1154
1150 center99.x = c->x; 1155 center99.x = c->x;
1151 center99.y = c->y; 1156 center99.y = c->y;
1152 sel = map_selection_rect_new(&center99, search_radius_this, search_order); 1157 sel = map_selection_rect_new(&center99, search_radius_this, search_order);
1153 sel->range.min = type_house_number; 1158 sel->range.min = type_house_number;

Legend:
Removed from v.48  
changed lines
  Added in v.49

   
Visit the ZANavi Wiki