Merge authors:
Trever Fischer (tdfischer)
Related merge proposals:
https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026
proposed by: Trever Fischer (tdfischer)
review: Approve - Seif Lotfy (seif)
------------------------------------------------------------
revno: 433 [merge]
committer: Seif Lotfy <s...@lotfy.com>
branch nick: zeitgeist
timestamp: Sat 2012-03-17 15:47:09 +0100
message:
Merged Trever's fixes for bug 953041
modified:
extensions/ds-registry.vala
src/db-reader.vala
src/engine.vala
src/table-lookup.vala
--
lp:zeitgeist
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird
Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist.
To unsubscribe from this branch go to
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription
=== modified file 'extensions/ds-registry.vala'
--- extensions/ds-registry.vala 2012-03-12 13:41:16 +0000
+++ extensions/ds-registry.vala 2012-03-12 14:10:17 +0000
@@ -144,7 +144,7 @@
return registry;
}
- private static Variant to_variant (
+ public static Variant to_variant (
HashTable<string, DataSource> sources)
{
var vb = new VariantBuilder (new VariantType (SIG_DATASOURCES));
=== modified file 'src/db-reader.vala'
--- src/db-reader.vala 2012-03-14 12:31:51 +0000
+++ src/db-reader.vala 2012-03-17 14:47:09 +0000
@@ -667,7 +667,7 @@
where.add_wildcard_condition ("actor", val, negated);
else
where.add_match_condition ("actor",
- actors_table.get_id (val), negated);
+ actors_table.id_try_string (val), negated);
}
// Origin
@@ -727,7 +727,7 @@
"subj_mimetype", val, negated);
else
where.add_match_condition ("subj_mimetype",
- mimetypes_table.get_id (val), negated);
+ mimetypes_table.id_try_string (val), negated);
}
// URI
@@ -866,14 +866,14 @@
if (symbols.length () == 1)
{
subwhere.add_match_condition (table_name,
- lookup_table.get_id (_symbol));
+ lookup_table.id_try_string (_symbol));
}
else
{
var sb = new StringBuilder ();
foreach (unowned string uri in symbols)
{
- sb.append_printf ("%d,", lookup_table.get_id (uri));
+ sb.append_printf ("%d,", lookup_table.id_try_string (uri));
}
sb.truncate (sb.len - 1);
=== modified file 'src/engine.vala'
--- src/engine.vala 2012-02-21 18:17:16 +0000
+++ src/engine.vala 2012-03-14 14:26:11 +0000
@@ -212,10 +212,10 @@
insert_stmt.bind_int64 (1, event.id);
insert_stmt.bind_int64 (2, event.timestamp);
insert_stmt.bind_int64 (3,
- interpretations_table.get_id (event.interpretation));
+ interpretations_table.id_for_string (event.interpretation));
insert_stmt.bind_int64 (4,
- manifestations_table.get_id (event.manifestation));
- insert_stmt.bind_int64 (5, actors_table.get_id (event.actor));
+ manifestations_table.id_for_string (event.manifestation));
+ insert_stmt.bind_int64 (5, actors_table.id_for_string (event.actor));
insert_stmt.bind_text (6, event.origin);
insert_stmt.bind_int64 (7, payload_id);
@@ -228,12 +228,12 @@
insert_stmt.bind_text (8, subject.uri);
insert_stmt.bind_text (9, subject.current_uri);
insert_stmt.bind_int64 (10,
- interpretations_table.get_id (subject.interpretation));
+ interpretations_table.id_for_string (subject.interpretation));
insert_stmt.bind_int64 (11,
- manifestations_table.get_id (subject.manifestation));
+ manifestations_table.id_for_string (subject.manifestation));
insert_stmt.bind_text (12, subject.origin);
insert_stmt.bind_int64 (13,
- mimetypes_table.get_id (subject.mimetype));
+ mimetypes_table.id_for_string (subject.mimetype));
insert_stmt.bind_text (14, subject.text);
// FIXME: Consider a storages_table table. Too dangerous?
insert_stmt.bind_text (15, subject.storage);
@@ -255,10 +255,10 @@
retrieval_stmt.bind_int64 (1, event.timestamp);
retrieval_stmt.bind_int64 (2,
- interpretations_table.get_id (event.interpretation));
+ interpretations_table.id_for_string (event.interpretation));
retrieval_stmt.bind_int64 (3,
- manifestations_table.get_id (event.manifestation));
- retrieval_stmt.bind_int64 (4, actors_table.get_id (event.actor));
+ manifestations_table.id_for_string (event.manifestation));
+ retrieval_stmt.bind_int64 (4, actors_table.id_for_string (event.actor));
if ((rc = retrieval_stmt.step ()) != Sqlite.ROW) {
warning ("SQL error: %d, %s\n", rc, db.errmsg ());
=== modified file 'src/table-lookup.vala'
--- src/table-lookup.vala 2012-02-13 20:14:41 +0000
+++ src/table-lookup.vala 2012-03-14 14:26:11 +0000
@@ -75,7 +75,26 @@
}
}
- public int get_id (string name)
+ /**
+ * Searches the table for the given ID, returns -1 if not found.
+ *
+ * @see id_for_string
+ */
+ public int id_try_string (string name)
+ {
+ int id = value_to_id.lookup (name);
+ if (id == 0)
+ return -1;
+ return id;
+ }
+
+ /**
+ * Searches the table for the given ID, inserts a new one if not found.
+ *
+ * @see id_for_string
+ *
+ */
+ public int id_for_string (string name)
{
int id = value_to_id.lookup (name);
if (id == 0)
_______________________________________________
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
