------------------------------------------------------------
revno: 317
committer: Michal Hruby <michal....@gmail.com>
branch nick: bb-fts
timestamp: Mon 2011-10-17 09:46:27 +0200
message:
A couple of fixes
modified:
configure.ac
extensions/fts-python/sql.py
src/datamodel.vala
--
lp:~zeitgeist/zeitgeist/bluebird
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird
Your team Zeitgeist Framework Team is subscribed to branch
lp:~zeitgeist/zeitgeist/bluebird.
To unsubscribe from this branch go to
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription
=== modified file 'configure.ac'
--- configure.ac 2011-10-12 13:40:58 +0000
+++ configure.ac 2011-10-17 07:46:27 +0000
@@ -25,11 +25,12 @@
AC_SUBST(LDFLAGS)
GLIB_REQUIRED=2.26.0
+SQLITE_REQUIRED=3.7
BLUEBIRD_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gobject-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
- sqlite3"
+ sqlite3 >= $SQLITE_REQUIRED"
PKG_CHECK_MODULES(BLUEBIRD, [$BLUEBIRD_REQUIRED])
AC_SUBST(BLUEBIRD_CFLAGS)
=== modified file 'extensions/fts-python/sql.py'
--- extensions/fts-python/sql.py 2011-10-10 14:07:42 +0000
+++ extensions/fts-python/sql.py 2011-10-17 07:46:27 +0000
@@ -209,7 +209,7 @@
# gains us a big speedup, for more information see http://www.sqlite.org/wal.html
# FIXME: Set journal_mode to WAL when teamdecision has been take.
# cursor.execute("PRAGMA journal_mode = WAL")
- cursor.execute("PRAGMA journal_mode = DELETE")
+ # cursor.execute("PRAGMA journal_mode = DELETE")
# Seif: another result of the performance tweaks discussed in (LP: #639737)
# we decided to set locking_mode to EXCLUSIVE, from now on only
# one connection to the database is allowed to revert this setting set locking_mode to NORMAL.
=== modified file 'src/datamodel.vala'
--- src/datamodel.vala 2011-10-12 21:05:59 +0000
+++ src/datamodel.vala 2011-10-17 07:46:27 +0000
@@ -316,7 +316,7 @@
VariantIter iter = event_variant.iterator ();
- assert (iter.n_children () == 3);
+ assert (iter.n_children () >= 3);
VariantIter event_array = iter.next_value ().iterator ();
VariantIter subjects_array = iter.next_value ().iterator ();
Variant payload_variant = iter.next_value ();
@@ -360,7 +360,7 @@
var vb = new VariantBuilder (new VariantType ("("+Utils.SIG_EVENT+")"));
vb.open (new VariantType ("as"));
- vb.add ("s", id.to_string ());
+ vb.add ("s", id == 0 ? "" : id.to_string ());
vb.add ("s", timestamp.to_string ());
vb.add ("s", interpretation != null ? interpretation : "");
vb.add ("s", manifestation != null ? manifestation : "");
_______________________________________________
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
