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

Attach bookmark table and union bookmarks in location completion

Browse source
This commit is contained in:
Alexander Butenko 2010-07-19 21:07:26 +02:00 committed by Christian Dywan
parent 687de063f9
commit 9a098e2656
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
midori/main.c
View file

@ -351,12 +351,14 @@ search_engines_save_to_file (KatzeArray* search_engines,
static sqlite3* static sqlite3*
midori_history_initialize (KatzeArray* array, midori_history_initialize (KatzeArray* array,
const gchar* filename, const gchar* filename,
const gchar* bookmarks_filename,
char** errmsg) char** errmsg)
{ {
sqlite3* db; sqlite3* db;
gboolean has_day; gboolean has_day;
sqlite3_stmt* stmt; sqlite3_stmt* stmt;
gint result; gint result;
gchar* sql;
has_day = FALSE; has_day = FALSE;
@ -401,6 +403,11 @@ midori_history_initialize (KatzeArray* array,
"DROP TABLE backup;" "DROP TABLE backup;"
"COMMIT;", "COMMIT;",
NULL, NULL, errmsg); NULL, NULL, errmsg);
sql = g_strdup_printf ("ATTACH DATABASE '%s' AS bookmarks", bookmarks_filename);
sqlite3_exec (db, sql, NULL, NULL, errmsg);
g_free (sql);
return db; return db;
} }
@ -1546,6 +1553,7 @@ main (int argc,
gchar** extensions; gchar** extensions;
MidoriWebSettings* settings; MidoriWebSettings* settings;
gchar* config_file; gchar* config_file;
gchar* bookmarks_file;
MidoriStartup load_on_startup; MidoriStartup load_on_startup;
KatzeArray* search_engines; KatzeArray* search_engines;
KatzeArray* bookmarks; KatzeArray* bookmarks;
@ -1881,9 +1889,9 @@ main (int argc,
midori_startup_timer ("Search read: \t%f"); midori_startup_timer ("Search read: \t%f");
bookmarks = katze_array_new (KATZE_TYPE_ARRAY); bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
katze_assign (config_file, build_config_filename ("bookmarks.db")); bookmarks_file = build_config_filename ("bookmarks.db");
errmsg = NULL; errmsg = NULL;
if ((db = midori_bookmarks_initialize (bookmarks, config_file, &errmsg)) == NULL) if ((db = midori_bookmarks_initialize (bookmarks, bookmarks_file, &errmsg)) == NULL)
{ {
g_string_append_printf (error_messages, g_string_append_printf (error_messages,
_("Bookmarks couldn't be loaded: %s\n"), errmsg); _("Bookmarks couldn't be loaded: %s\n"), errmsg);
@ -1938,12 +1946,13 @@ main (int argc,
katze_assign (config_file, build_config_filename ("history.db")); katze_assign (config_file, build_config_filename ("history.db"));
errmsg = NULL; errmsg = NULL;
if ((db = midori_history_initialize (history, config_file, &errmsg)) == NULL) if ((db = midori_history_initialize (history, config_file, bookmarks_file ,&errmsg)) == NULL)
{ {
g_string_append_printf (error_messages, g_string_append_printf (error_messages,
_("The history couldn't be loaded: %s\n"), errmsg); _("The history couldn't be loaded: %s\n"), errmsg);
g_free (errmsg); g_free (errmsg);
} }
g_free (bookmarks_file);
g_object_set_data (G_OBJECT (history), "db", db); g_object_set_data (G_OBJECT (history), "db", db);
midori_startup_timer ("History read: \t%f"); midori_startup_timer ("History read: \t%f");

3
midori/midori-locationaction.c
View file

@ -361,6 +361,9 @@ midori_location_action_popup_timeout_cb (gpointer data)
"UNION ALL " "UNION ALL "
"SELECT type, replace(uri, '%s', title) AS uri, title, count() AS ct FROM search_view " "SELECT type, replace(uri, '%s', title) AS uri, title, count() AS ct FROM search_view "
"WHERE title LIKE ?1 GROUP BY uri " "WHERE title LIKE ?1 GROUP BY uri "
"UNION ALL "
"SELECT '1' AS type, uri, title, '100' AS ct FROM bookmarks "
"WHERE title LIKE ?1 AND uri !='' "
"ORDER BY ct DESC LIMIT ?2"; "ORDER BY ct DESC LIMIT ?2";
sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL); sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL);
} }