[Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
The proposal to merge lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
Branch updated. -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
Hm, personally I'd prefer a bool create=false parameter in get_id. Having get_ and find_ is kinda confusing (esp. with get_ inserting stuff :p). -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
same here -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
Finding an ID simply searches for an ID and returns -1 if one is not found. Getting an ID is defined as returning a valid ID number for the given string one way or another. Adding a default argument to a vala method that is public breaks source and binary compatability with users of the generated C code. -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
Not a problem, everything in lp:zeitgeist is private API so far :). -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
but he has a point there since we did want to set up libzg 2 based on the internals of zeitgeist On Tue, Mar 13, 2012 at 8:55 PM, Siegfried Gevatter rai...@ubuntu.comwrote: Not a problem, everything in lp:zeitgeist is private API so far :). -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 You are requested to review the proposed merge of lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist. -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
2012/3/13 Seif Lotfy s...@lotfy.com: but he has a point there since we did want to set up libzg 2 based on the internals of zeitgeist Yes, so it's time to get nice clean APIs before stuff gets exposed. But anyway, TableLookup is still then just internal API. -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
TableLookup is still then just internal API. Indeed, we don't need to care about binary compability here. get_id / find_id is very ambiguous, I'd rather get rid of both, and have a more common try_ variant (perhaps id_for_string / id_try_string), so just something that makes the insertion side-effect clear on one of those (get_or_create?). -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
Trever Fischer has proposed merging lp:~tdfischer/zeitgeist/bluebird into
lp:zeitgeist.
Requested reviews:
Seif Lotfy (seif)
For more details, see:
https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026
Fixes #953041
--
https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026
Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist.
=== modified file 'extensions/ds-registry.vala'
--- extensions/ds-registry.vala 2012-03-12 13:41:16 +
+++ extensions/ds-registry.vala 2012-03-12 14:19:24 +
@@ -144,7 +144,7 @@
return registry;
}
-private static Variant to_variant (
+public static Variant to_variant (
HashTablestring, DataSource sources)
{
var vb = new VariantBuilder (new VariantType (SIG_DATASOURCES));
=== modified file 'src/db-reader.vala'
--- src/db-reader.vala 2012-02-05 14:52:13 +
+++ src/db-reader.vala 2012-03-12 14:19:24 +
@@ -652,7 +652,7 @@
where.add_wildcard_condition (actor, val, negated);
else
where.add_match_condition (actor,
-actors_table.get_id (val), negated);
+actors_table.find_id (val), negated);
}
// Origin
@@ -712,7 +712,7 @@
subj_mimetype, val, negated);
else
where.add_match_condition (subj_mimetype,
-mimetypes_table.get_id (val), negated);
+mimetypes_table.find_id (val), negated);
}
// URI
@@ -851,14 +851,14 @@
if (symbols.length () == 1)
{
subwhere.add_match_condition (table_name,
-lookup_table.get_id (_symbol));
+lookup_table.find_id (_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.find_id (uri));
}
sb.truncate (sb.len - 1);
=== modified file 'src/table-lookup.vala'
--- src/table-lookup.vala 2012-02-13 20:14:41 +
+++ src/table-lookup.vala 2012-03-12 14:19:24 +
@@ -75,6 +75,25 @@
}
}
+/**
+ * Searches the table for the given ID, returns -1 if not found.
+ *
+ * @see get_id
+ */
+public int find_id (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 find_id
+ *
+ */
public int get_id (string name)
{
int id = value_to_id.lookup (name);
___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
