debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework history panel search query

Browse source
This commit is contained in:
Alexander Butenko 2010-07-20 15:25:34 -04:00 committed by Christian Dywan
parent ca9010acd5
commit 58f3444ba1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
panels/midori-history.c
View file

@ -207,16 +207,17 @@ midori_history_read_from_db (MidoriHistory* history,
{ {
gchar* filterstr; gchar* filterstr;
sqlcmd = "SELECT uri, title, day FROM history_view " sqlcmd = "SELECT * FROM ("
"WHERE uri LIKE ? or title LIKE ? GROUP BY uri " " SELECT uri, title, day FROM history"
" WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri "
"UNION ALL " "UNION ALL "
"SELECT replace(uri, '%s', title) AS uri, title, day " " SELECT replace (uri, '%s', keywords) AS uri, "
"FROM search_view WHERE title LIKE ?1 GROUP BY uri " " keywords AS title, day FROM search "
"ORDER BY day ASC"; " WHERE uri LIKE ?1 OR keywords LIKE ?1 GROUP BY uri "
") ORDER BY day ASC";
result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL);
filterstr = g_strdup_printf ("%%%s%%", filter); filterstr = g_strdup_printf ("%%%s%%", filter);
sqlite3_bind_text (statement, 1, filterstr, -1, g_free); sqlite3_bind_text (statement, 1, filterstr, -1, g_free);
sqlite3_bind_text (statement, 2, g_strdup (filterstr), -1, g_free);
req_day = -1; req_day = -1;
} }
else if (req_day == 0) else if (req_day == 0)