Fix:core:Change all logging at lvl_error/warning to lvl_debug, unless it looks like an error message.|#1269, part 5

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5967 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 43 insertions, 43 deletions

diff --git a/navit/android.c b/navit/android.c
index bee9ec8b0..f1b443868 100644
--- a/navit/android.c
+++ b/navit/android.c
@@ -83,12 +83,12 @@ Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject
 	jnienv=env;
 	android_activity = (*jnienv)->NewGlobalRef(jnienv, activity);
 	langstr=(*env)->GetStringUTFChars(env, lang, NULL);
-	dbg(lvl_error,"enter env=%p thiz=%p activity=%p lang=%s version=%d\n",env,thiz,android_activity,langstr,version);
+	dbg(lvl_debug,"enter env=%p thiz=%p activity=%p lang=%s version=%d\n",env,thiz,android_activity,langstr,version);
 	setenv("LANG",langstr,1);
 	(*env)->ReleaseStringUTFChars(env, lang, langstr);
 
 	displaydensitystr=(*env)->GetStringUTFChars(env, display_density_string, NULL);
-	dbg(lvl_error,"*****displaydensity=%s\n",displaydensitystr);
+	dbg(lvl_debug,"*****displaydensity=%s\n",displaydensitystr);
 	setenv("ANDROID_DENSITY",displaydensitystr,1);
 	(*env)->ReleaseStringUTFChars(env, display_density_string, displaydensitystr);
 	const char *strings=(*env)->GetStringUTFChars(env, path, NULL);
@@ -99,14 +99,14 @@ Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject
 JNIEXPORT void JNICALL
 Java_org_navitproject_navit_Navit_NavitDestroy( JNIEnv* env)
 {
-	dbg(lvl_error, "shutdown navit\n");
+	dbg(lvl_debug, "shutdown navit\n");
 	exit(0);
 }
 
 JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitGraphics_SizeChangedCallback( JNIEnv* env, jobject thiz, int id, int w, int h)
 {
-	dbg(lvl_error,"enter %p %d %d\n",(struct callback *)id,w,h);
+	dbg(lvl_debug,"enter %p %d %d\n",(struct callback *)id,w,h);
 	if (id)
 		callback_call_2((struct callback *)id,w,h);
 }
@@ -114,7 +114,7 @@ Java_org_navitproject_navit_NavitGraphics_SizeChangedCallback( JNIEnv* env, jobj
 JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitGraphics_ButtonCallback( JNIEnv* env, jobject thiz, int id, int pressed, int button, int x, int y)
 {
-	dbg(lvl_warning,"enter %p %d %d\n",(struct callback *)id,pressed,button);
+	dbg(lvl_debug,"enter %p %d %d\n",(struct callback *)id,pressed,button);
 	if (id)
 		callback_call_4((struct callback *)id,pressed,button,x,y);
 }
@@ -122,7 +122,7 @@ Java_org_navitproject_navit_NavitGraphics_ButtonCallback( JNIEnv* env, jobject t
 JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitGraphics_MotionCallback( JNIEnv* env, jobject thiz, int id, int x, int y)
 {
-	dbg(lvl_warning,"enter %p %d %d\n",(struct callback *)id,x,y);
+	dbg(lvl_debug,"enter %p %d %d\n",(struct callback *)id,x,y);
 	if (id)
 		callback_call_2((struct callback *)id,x,y);
 }
@@ -131,9 +131,9 @@ JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitGraphics_KeypressCallback( JNIEnv* env, jobject thiz, int id, jobject str)
 {
 	const char *s;
-	dbg(lvl_error,"enter %p %p\n",(struct callback *)id,str);
+	dbg(lvl_debug,"enter %p %p\n",(struct callback *)id,str);
 	s=(*env)->GetStringUTFChars(env, str, NULL);
-	dbg(lvl_error,"key=%d",s);
+	dbg(lvl_debug,"key=%d",s);
 	if (id)
 		callback_call_1((struct callback *)id,s);
 	(*env)->ReleaseStringUTFChars(env, str, s);
@@ -143,7 +143,7 @@ JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitTimeout_TimeoutCallback( JNIEnv* env, jobject thiz, int id)
 {
 	void (*event_handler)(void *) = *(void **)id;
-	dbg(lvl_warning,"enter %p %p\n",thiz, (void *)id);
+	dbg(lvl_debug,"enter %p %p\n",thiz, (void *)id);
 	event_handler((void*)id);
 }
 
@@ -156,7 +156,7 @@ Java_org_navitproject_navit_NavitVehicle_VehicleCallback( JNIEnv * env, jobject
 JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitIdle_IdleCallback( JNIEnv* env, jobject thiz, int id)
 {
-	dbg(lvl_warning,"enter %p %p\n",thiz, (void *)id);
+	dbg(lvl_debug,"enter %p %p\n",thiz, (void *)id);
 	callback_call_0((struct callback *)id);
 }
 
@@ -171,14 +171,14 @@ Java_org_navitproject_navit_NavitWatch_poll( JNIEnv* env, jobject thiz, int func
 JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitWatch_WatchCallback( JNIEnv* env, jobject thiz, int id)
 {
-	dbg(lvl_warning,"enter %p %p\n",thiz, (void *)id);
+	dbg(lvl_debug,"enter %p %p\n",thiz, (void *)id);
 	callback_call_0((struct callback *)id);
 }
 
 JNIEXPORT void JNICALL
 Java_org_navitproject_navit_NavitSensors_SensorCallback( JNIEnv* env, jobject thiz, int id, int sensor, float x, float y, float z)
 {
-	dbg(lvl_warning,"enter %p %p %f %f %f\n",thiz, (void *)id,x,y,z);
+	dbg(lvl_debug,"enter %p %p %f %f %f\n",thiz, (void *)id,x,y,z);
 	callback_call_4((struct callback *)id, sensor, &x, &y, &z);
 }
 
@@ -208,10 +208,10 @@ Java_org_navitproject_navit_NavitGraphics_CallbackLocalizedString( JNIEnv* env,
 	const char *localized_str;
 
 	s=(*env)->GetStringUTFChars(env, str, NULL);
-	//dbg(lvl_error,"*****string=%s\n",s);
+	//dbg(lvl_debug,"*****string=%s\n",s);
 
 	localized_str=navit_nls_gettext(s);
-	//dbg(lvl_error,"localized string=%s",localized_str);
+	//dbg(lvl_debug,"localized string=%s",localized_str);
 
 	// jstring dataStringValue = (jstring) localized_str;
 	jstring js = (*env)->NewStringUTF(env,localized_str);
@@ -227,7 +227,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 	struct attr attr;
 	const char *s;
 	jint ret = 0;
-	dbg(lvl_error,"enter %d %p\n",channel,str);
+	dbg(lvl_debug,"enter %d %p\n",channel,str);
 
 	config_get_attr(config_get(), attr_navit, &attr, NULL);
 
@@ -248,7 +248,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 		struct mapset *ms = navit_get_mapset(attr.u.navit);
 		struct attr type, name, data, *attrs[4];
 		const char *map_location=(*env)->GetStringUTFChars(env, str, NULL);
-		dbg(lvl_error,"*****string=%s\n",map_location);
+		dbg(lvl_debug,"*****string=%s\n",map_location);
 		type.type=attr_type;
 		type.u.str="binfile";
 
@@ -280,7 +280,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 
 		if (delete_map)
 		{
-			dbg(lvl_error,"delete map %s (%p)", map_location, delete_map);
+			dbg(lvl_debug,"delete map %s (%p)", map_location, delete_map);
 			map_r.type=attr_map;
 			map_r.u.map=delete_map;
 			ret = mapset_remove_attr(ms, &map_r);
@@ -292,7 +292,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 	case 5:
 		// call a command (like in gui)
 		s=(*env)->GetStringUTFChars(env, str, NULL);
-		dbg(lvl_error,"*****string=%s\n",s);
+		dbg(lvl_debug,"*****string=%s\n",s);
 		command_evaluate(&attr,s);
 		(*env)->ReleaseStringUTFChars(env, str, s);
 		break;
@@ -310,7 +310,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 		char parse_str[strlen(s) + 1];
 		strcpy(parse_str, s);
 		(*env)->ReleaseStringUTFChars(env, str, s);
-		dbg(lvl_error,"*****string=%s\n",parse_str);
+		dbg(lvl_debug,"*****string=%s\n",parse_str);
 
 		// set destination to (pixel-x#pixel-y)
 		// pixel-x
@@ -320,8 +320,8 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 		pstr = strtok (NULL, "#");
 		p.y = atoi(pstr);
 
-		dbg(lvl_error,"11x=%d\n",p.x);
-		dbg(lvl_error,"11y=%d\n",p.y);
+		dbg(lvl_debug,"11x=%d\n",p.x);
+		dbg(lvl_debug,"11y=%d\n",p.y);
 
 		transform_reverse(transform, &p, &c);
 
@@ -330,8 +330,8 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 		pc.y = c.y;
 		pc.pro = transform_get_projection(transform);
 
-		dbg(lvl_error,"22x=%d\n",pc.x);
-		dbg(lvl_error,"22y=%d\n",pc.y);
+		dbg(lvl_debug,"22x=%d\n",pc.x);
+		dbg(lvl_debug,"22y=%d\n",pc.y);
 
 		// start navigation asynchronous
 		navit_set_destination(attr.u.navit, &pc, parse_str, 1);
@@ -345,7 +345,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 		char parse_str[strlen(s) + 1];
 		strcpy(parse_str, s);
 		(*env)->ReleaseStringUTFChars(env, str, s);
-		dbg(lvl_error,"*****string=%s\n",s);
+		dbg(lvl_debug,"*****string=%s\n",s);
 
 		// set destination to (lat#lon#title)
 		struct coord_geo g;
@@ -361,9 +361,9 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 		// description
 		name = strtok (NULL, "#");
 
-		dbg(lvl_error,"lat=%f\n",g.lat);
-		dbg(lvl_error,"lng=%f\n",g.lng);
-		dbg(lvl_error,"str1=%s\n",name);
+		dbg(lvl_debug,"lat=%f\n",g.lat);
+		dbg(lvl_debug,"lng=%f\n",g.lng);
+		dbg(lvl_debug,"str1=%s\n",name);
 
 		struct coord c;
 		transform_from_geo(projection_mg, &g, &c);
@@ -379,7 +379,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j
 	}
 	break;
 	default:
-		dbg(lvl_error, "Unknown command");
+		dbg(lvl_error, "Unknown command: %d", channel);
 	}
 
 	return ret;
@@ -394,7 +394,7 @@ Java_org_navitproject_navit_NavitGraphics_GetDefaultCountry( JNIEnv* env, jobjec
 	jstring return_string = NULL;
 
 	struct attr attr;
-	dbg(lvl_error,"enter %d %p\n",channel,str);
+	dbg(lvl_debug,"enter %d %p\n",channel,str);
 
 	config_get_attr(config_get(), attr_navit, &attr, NULL);
 
@@ -409,12 +409,12 @@ Java_org_navitproject_navit_NavitGraphics_GetDefaultCountry( JNIEnv* env, jobjec
 			struct mapset *ms=navit_get_mapset(attr.u.navit);
 			struct search_list *search_list = search_list_new(ms);
 			search_attr.type=attr_country_all;
-			dbg(lvl_error,"country %s\n", country_name.u.str);
+			dbg(lvl_debug,"country %s\n", country_name.u.str);
 			search_attr.u.str=country_name.u.str;
 			search_list_search(search_list, &search_attr, 0);
 			while((res=search_list_get_result(search_list)))
 			{
-				dbg(lvl_error,"Get result: %s\n", res->country->iso2);
+				dbg(lvl_debug,"Get result: %s\n", res->country->iso2);
 			}
 			if (item_attr_get(item, attr_country_iso2, &country_iso2))
 				return_string = (*env)->NewStringUTF(env,country_iso2.u.str);
@@ -435,7 +435,7 @@ Java_org_navitproject_navit_NavitGraphics_GetAllCountries( JNIEnv* env, jobject
 	jobjectArray all_countries;
 
 	struct attr attr;
-	dbg(lvl_error,"enter\n");
+	dbg(lvl_debug,"enter\n");
 
 	config_get_attr(config_get(), attr_navit, &attr, NULL);
 
@@ -443,12 +443,12 @@ Java_org_navitproject_navit_NavitGraphics_GetAllCountries( JNIEnv* env, jobject
 	struct search_list *search_list = search_list_new(ms);
 	jobjectArray current_country = NULL;
 	search_attr.type=attr_country_all;
-	//dbg(lvl_error,"country %s\n", country_name.u.str);
+	//dbg(lvl_debug,"country %s\n", country_name.u.str);
 	search_attr.u.str=g_strdup("");//country_name.u.str;
 	search_list_search(search_list, &search_attr, 1);
 	while((res=search_list_get_result(search_list)))
 	{
-		dbg(lvl_error,"Get result: %s\n", res->country->iso2);
+		dbg(lvl_debug,"Get result: %s\n", res->country->iso2);
 
 		if (strlen(res->country->iso2)==2)
 		{
@@ -543,7 +543,7 @@ town_str(struct search_list_result *res, int level)
 static void
 android_search_end(struct android_search_priv *search_priv)
 {
-	dbg(lvl_warning, "End search");
+	dbg(lvl_debug, "End search");
 	JNIEnv* env = search_priv->search_result_obj.env;
 	if (search_priv->idle_ev) {
 		event_remove_idle(search_priv->idle_ev);
@@ -575,11 +575,11 @@ static enum attr_type android_search_level[] = {
 static void
 android_search_idle(struct android_search_priv *search_priv)
 {
-	dbg(lvl_warning, "enter android_search_idle");
+	dbg(lvl_debug, "enter android_search_idle");
 
 	struct search_list_result *res = search_list_get_result(search_priv->search_list);
 	if (res) {
-		dbg(lvl_warning, "Town: %s, Street: %s\n",res->town ? res->town->common.town_name : "no town", res->street ? res->street->name : "no street");
+		dbg(lvl_debug, "Town: %s, Street: %s\n",res->town ? res->town->common.town_name : "no town", res->street ? res->street->name : "no street");
 		search_priv->found = 1;
 		switch (search_priv->search_attr.type)
 		{
@@ -634,7 +634,7 @@ android_search_idle(struct android_search_priv *search_priv)
 			}
 		} while (level > 0 ? search_priv->current_phrase_per_level[level] == search_priv->current_phrase_per_level[level-1] : 0);
 		dbg(lvl_info, "used phrase: %d,%d, %d, level %d, '%s'", search_priv->current_phrase_per_level[0], search_priv->current_phrase_per_level[1], search_priv->current_phrase_per_level[2] , level, attr_to_name(android_search_level[level]))
-		dbg(lvl_warning, "Search for '%s'", search_priv->phrases[search_priv->current_phrase_per_level[level]]);
+		dbg(lvl_debug, "Search for '%s'", search_priv->phrases[search_priv->current_phrase_per_level[level]]);
 		search_priv->search_attr.type = android_search_level[level];
 		search_priv->search_attr.u.str = search_priv->phrases[search_priv->current_phrase_per_level[level]];
 		struct attr test;
@@ -677,12 +677,12 @@ search_fix_spaces(const char *str)
 
 static void start_search(struct android_search_priv *search_priv, const char *search_string)
 {
-	dbg(lvl_warning,"enter %s\n", search_string);
+	dbg(lvl_debug,"enter %s\n", search_string);
 	char *str=search_fix_spaces(search_string);
 	search_priv->phrases = g_strsplit(str, " ", 0);
 	//ret=search_address_town(ret, sl, phrases, NULL, partial, jni);
 
-	dbg(lvl_warning,"First search phrase %s", search_priv->phrases[0]);
+	dbg(lvl_debug,"First search phrase %s", search_priv->phrases[0]);
 	search_priv->search_attr.u.str= search_priv->phrases[0];
 	search_priv->search_attr.type=attr_town_or_district_name;
 	search_list_search(search_priv->search_list, &search_priv->search_attr, search_priv->partial);
@@ -692,7 +692,7 @@ static void start_search(struct android_search_priv *search_priv, const char *se
 	//callback_call_0(search_priv->idle_clb);
 
 	g_free(str);
-	dbg(lvl_warning,"leave\n");
+	dbg(lvl_debug,"leave\n");
 }
 
 JNIEXPORT jlong JNICALL
@@ -700,7 +700,7 @@ Java_org_navitproject_navit_NavitAddressSearchActivity_CallbackStartAddressSearc
 {
 	struct attr attr;
 	const char *search_string =(*env)->GetStringUTFChars(env, str, NULL);
-	dbg(lvl_error,"search '%s'\n", search_string);
+	dbg(lvl_debug,"search '%s'\n", search_string);
 
 	config_get_attr(config_get(), attr_navit, &attr, NULL);
 
@@ -733,7 +733,7 @@ Java_org_navitproject_navit_NavitAddressSearchActivity_CallbackStartAddressSearc
 		if (!count)
 			dbg(lvl_error,"Country not found");
 
-		dbg(lvl_warning,"search in country '%s'\n", str_country);
+		dbg(lvl_debug,"search in country '%s'\n", str_country);
 		(*env)->ReleaseStringUTFChars(env, country, str_country);
 
 		search_priv->search_result_obj.env = env;