Commit d0e98683 authored by Claes Sjofors's avatar Claes Sjofors

Eventlog search was somtimes case sensitive and couldn't handle åäö (refs #166)

parent 36926d47
...@@ -1147,8 +1147,8 @@ int dcli_wildcard( char *wildname, ...@@ -1147,8 +1147,8 @@ int dcli_wildcard( char *wildname,
char upper_name[400]; char upper_name[400];
/* Convert to upper case */ /* Convert to upper case */
// cdh_ToUpper( upper_name, name); cdh_ToLower( upper_name, name);
strcpy( upper_name, name); // strcpy( upper_name, name);
t = wildname; t = wildname;
u = upper_name; u = upper_name;
...@@ -1180,7 +1180,7 @@ int dcli_wildcard( char *wildname, ...@@ -1180,7 +1180,7 @@ int dcli_wildcard( char *wildname,
{ {
strncpy ( checkstr, t, len); strncpy ( checkstr, t, len);
checkstr[len] = '\0'; checkstr[len] = '\0';
u = strstr( u, checkstr); u = strstr( u, cdh_Low(checkstr));
if ( u == 0) if ( u == 0)
return 1; return 1;
u += len; u += len;
......
...@@ -503,10 +503,13 @@ void HistGtk::ok_btn( GtkWidget *w, gpointer data) ...@@ -503,10 +503,13 @@ void HistGtk::ok_btn( GtkWidget *w, gpointer data)
histOP->maxTime_str = gtk_editable_get_chars( GTK_EDITABLE(((HistGtk *)histOP)->stop_time_entry_w), 0, -1); histOP->maxTime_str = gtk_editable_get_chars( GTK_EDITABLE(((HistGtk *)histOP)->stop_time_entry_w), 0, -1);
histOP->eventText_str = gtk_editable_get_chars( GTK_EDITABLE(((HistGtk *)histOP)->event_text_entry_w), 0, -1); char *textutf8 = gtk_editable_get_chars( GTK_EDITABLE(((HistGtk *)histOP)->event_text_entry_w), 0, -1);
histOP->eventText_str = g_convert( textutf8, -1, "ISO8859-1", "UTF-8", NULL, NULL, NULL);
histOP->eventName_str = gtk_editable_get_chars( GTK_EDITABLE(((HistGtk *)histOP)->event_name_entry_w), 0, -1); g_free( textutf8);
textutf8 = gtk_editable_get_chars( GTK_EDITABLE(((HistGtk *)histOP)->event_name_entry_w), 0, -1);
histOP->eventName_str = g_convert( textutf8, -1, "ISO8859-1", "UTF-8", NULL, NULL, NULL);
g_free( textutf8);
histOP->get_hist_list(); histOP->get_hist_list();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment