[Zeitgeist] [Bug 884192] Re: Update to shared-desktop-ontologies-0.8
** Changed in: libzeitgeist Status: Fix Committed = Fix Released -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/884192 Title: Update to shared-desktop-ontologies-0.8 Status in Zeitgeist Client Library: Fix Released Status in Zeitgeist Framework: Fix Released Bug description: The shared-desktop-ontologies that we use has recently released version 0.8. Among a range of other new classes it includes nfo:WebDataObject which is of particular interest to us as it allows us to properly describe web pages (since nfo:WebDataObject is not a subclass of nfo:FileDataObject, unlike nfo:RemoteDtaObject which has caused us some pain). To manage notifications about this bug go to: https://bugs.launchpad.net/libzeitgeist/+bug/884192/+subscriptions ___ 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:~rainct/zeitgeist/961974 into lp:zeitgeist
Siegfried Gevatter has proposed merging lp:~rainct/zeitgeist/961974 into
lp:zeitgeist.
Requested reviews:
Zeitgeist Framework Team (zeitgeist)
Related bugs:
Bug #961974 in Zeitgeist Framework: Recover from Zeitgeist database
corruption (detected at query time)
https://bugs.launchpad.net/zeitgeist/+bug/961974
For more details, see:
https://code.launchpad.net/~rainct/zeitgeist/961974/+merge/100946
--
https://code.launchpad.net/~rainct/zeitgeist/961974/+merge/100946
Your team Zeitgeist Framework Team is requested to review the proposed merge of
lp:~rainct/zeitgeist/961974 into lp:zeitgeist.
=== modified file 'extensions/histogram.vala'
--- extensions/histogram.vala 2011-12-07 12:17:29 +
+++ extensions/histogram.vala 2012-04-05 12:15:23 +
@@ -96,14 +96,8 @@
builder.add ((xu), t, count);
}
-
-if (rc != Sqlite.DONE)
-{
-string error_message = Error in get_histogram_data: +
-%d, %s.printf (rc, db.errmsg ());
-warning (%s, error_message);
-throw new EngineError.DATABASE_ERROR (error_message);
-}
+database.assert_query_success (rc, Error in get_histogram_data,
+Sqlite.DONE);
return builder.end ();
}
=== modified file 'src/db-reader.vala'
--- src/db-reader.vala 2012-03-19 19:56:38 +
+++ src/db-reader.vala 2012-04-05 12:15:23 +
@@ -55,13 +55,22 @@
database.set_deletion_callback (delete_from_cache);
db = database.database;
-interpretations_table = new TableLookup (database, interpretation);
-manifestations_table = new TableLookup (database, manifestation);
-mimetypes_table = new TableLookup (database, mimetype);
-actors_table = new TableLookup (database, actor);
+try
+{
+interpretations_table = new TableLookup (database, interpretation);
+manifestations_table = new TableLookup (database, manifestation);
+mimetypes_table = new TableLookup (database, mimetype);
+actors_table = new TableLookup (database, actor);
+}
+catch (EngineError err)
+{
+// FIXME: propagate this properly?
+critical (TableLookup initialization failed: %s, err.message);
+}
}
protected Event get_event_from_row (Sqlite.Statement stmt, uint32 event_id)
+throws EngineError
{
Event event = new Event ();
event.id = event_id;
@@ -88,6 +97,7 @@
}
protected Subject get_subject_from_row (Sqlite.Statement stmt)
+throws EngineError
{
Subject subject = new Subject ();
subject.uri = stmt.column_text (EventViewRows.SUBJECT_URI);
@@ -142,11 +152,7 @@
Subject subject = get_subject_from_row(stmt);
event.add_subject(subject);
}
-if (rc != Sqlite.DONE)
-{
-throw new EngineError.DATABASE_ERROR (Error: %d, %s\n,
-rc, db.errmsg ());
-}
+database.assert_query_success (rc, Error, Sqlite.DONE);
// Sort events according to the sequence of event_ids
var results = new GenericArrayEvent? ();
@@ -270,7 +276,7 @@
warning (error_message);
throw new EngineError.INVALID_ARGUMENT (error_message);
}
-
+
// complete the sort rule
bool time_asc = ResultType.is_sort_order_asc ((ResultType) result_type);
sql += timestamp %s.printf ((time_asc) ? ASC : DESC);
@@ -306,6 +312,7 @@
string error_message = Error in find_event_ids: %d, %s.printf (
rc, db.errmsg ());
warning (error_message);
+database.assert_not_corrupt (rc);
throw new EngineError.DATABASE_ERROR (error_message);
}
@@ -458,14 +465,7 @@
// for (int i=0; irelated_uris.length; i++)
//related_uris[i] = temp_related_uris[i];
-if (rc != Sqlite.DONE)
-{
-string error_message =
-Error in find_related_uris: %d, %s.printf (
-rc, db.errmsg ());
-warning (error_message);
-throw new EngineError.DATABASE_ERROR (error_message);
-}
+database.assert_query_success (rc, Error in find_related_uris);
var uri_counter = new HashTablestring, RelatedUri?(
str_hash, str_equal);
=== modified file 'src/engine.vala'
--- src/engine.vala 2012-03-14 14:26:11 +
+++ src/engine.vala 2012-04-05 12:15:23 +
@@ -241,6 +241,7 @@
if ((rc = insert_stmt.step()) != Sqlite.DONE) {
if (rc != Sqlite.CONSTRAINT)
{
+database.assert_not_corrupt (rc);
warning (SQL error: %d, %s\n, rc, db.errmsg ());
return 0;
}
@@
[Zeitgeist] [Bug 961974] Re: Recover from Zeitgeist database corruption (detected at query time)
** Branch linked: lp:~rainct/zeitgeist/961974 -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/961974 Title: Recover from Zeitgeist database corruption (detected at query time) Status in Unity: Incomplete Status in Unity Files Lens: Incomplete Status in Zeitgeist Framework: In Progress Bug description: This is based on the checkbox test: 1. Start gedit. 2. Save a file named foo in your home folder. 1. Tap super to open the dash 2. Enter f - The results should contain at least the foo file and Firefox 3. Click on the cross next to f, in the textentry - The f search should be canceled, bringing you back to the generic Search entry with the default elements I slightly modified it and instead of file called foo I have a hello_world_file (as foo returned far too many other results). Actual result: The file can not be found via dash (or file lens). ProblemType: Bug DistroRelease: Ubuntu 12.04 Package: unity 5.6.0+bzr2156ubuntu0+670 [origin: LP-PPA-unity-team-staging] ProcVersionSignature: Ubuntu 3.2.0-19.31-generic-pae 3.2.12 Uname: Linux 3.2.0-19-generic-pae i686 ApportVersion: 1.94.1-0ubuntu2 Architecture: i386 CompizPlugins: [core,composite,opengl,compiztoolbox,decor,vpswitch,snap,mousepoll,resize,place,move,wall,grid,regex,imgpng,session,gnomecompat,animation,fade,unitymtgrabhandles,workarounds,scale,expo,ezoom,unityshell] CrashDB: unity Date: Thu Mar 22 10:00:40 2012 InstallationMedia: Ubuntu 11.10 Oneiric Ocelot - Release i386 (20111012) SourcePackage: unity UpgradeStatus: Upgraded to precise on 2012-02-17 (33 days ago) To manage notifications about this bug go to: https://bugs.launchpad.net/unity/+bug/961974/+subscriptions ___ 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:~rainct/zeitgeist/961974 into lp:zeitgeist
Review: Approve Looks good, very simple. Nice job -- https://code.launchpad.net/~rainct/zeitgeist/961974/+merge/100946 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] [Branch ~zeitgeist/zeitgeist/bluebird] Rev 461: Enhanced database corruption detection and recovery.
revno: 461
fixes bug: https://launchpad.net/bugs/961974
committer: Siegfried-Angel Gevatter Pujals siegfr...@gevatter.com
branch nick: bluebird
timestamp: Thu 2012-04-05 14:12:49 +0200
message:
Enhanced database corruption detection and recovery.
modified:
extensions/histogram.vala
src/db-reader.vala
src/engine.vala
src/extension-store.vala
src/sql-schema.vala
src/sql.vala
src/table-lookup.vala
src/utils.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/histogram.vala'
--- extensions/histogram.vala 2011-12-07 12:17:29 +
+++ extensions/histogram.vala 2012-04-05 12:12:49 +
@@ -96,14 +96,8 @@
builder.add ((xu), t, count);
}
-
-if (rc != Sqlite.DONE)
-{
-string error_message = Error in get_histogram_data: +
-%d, %s.printf (rc, db.errmsg ());
-warning (%s, error_message);
-throw new EngineError.DATABASE_ERROR (error_message);
-}
+database.assert_query_success (rc, Error in get_histogram_data,
+Sqlite.DONE);
return builder.end ();
}
=== modified file 'src/db-reader.vala'
--- src/db-reader.vala 2012-03-19 19:56:38 +
+++ src/db-reader.vala 2012-04-05 12:12:49 +
@@ -55,13 +55,22 @@
database.set_deletion_callback (delete_from_cache);
db = database.database;
-interpretations_table = new TableLookup (database, interpretation);
-manifestations_table = new TableLookup (database, manifestation);
-mimetypes_table = new TableLookup (database, mimetype);
-actors_table = new TableLookup (database, actor);
+try
+{
+interpretations_table = new TableLookup (database, interpretation);
+manifestations_table = new TableLookup (database, manifestation);
+mimetypes_table = new TableLookup (database, mimetype);
+actors_table = new TableLookup (database, actor);
+}
+catch (EngineError err)
+{
+// FIXME: propagate this properly?
+critical (TableLookup initialization failed: %s, err.message);
+}
}
protected Event get_event_from_row (Sqlite.Statement stmt, uint32 event_id)
+throws EngineError
{
Event event = new Event ();
event.id = event_id;
@@ -88,6 +97,7 @@
}
protected Subject get_subject_from_row (Sqlite.Statement stmt)
+throws EngineError
{
Subject subject = new Subject ();
subject.uri = stmt.column_text (EventViewRows.SUBJECT_URI);
@@ -142,11 +152,7 @@
Subject subject = get_subject_from_row(stmt);
event.add_subject(subject);
}
-if (rc != Sqlite.DONE)
-{
-throw new EngineError.DATABASE_ERROR (Error: %d, %s\n,
-rc, db.errmsg ());
-}
+database.assert_query_success (rc, Error, Sqlite.DONE);
// Sort events according to the sequence of event_ids
var results = new GenericArrayEvent? ();
@@ -270,7 +276,7 @@
warning (error_message);
throw new EngineError.INVALID_ARGUMENT (error_message);
}
-
+
// complete the sort rule
bool time_asc = ResultType.is_sort_order_asc ((ResultType) result_type);
sql += timestamp %s.printf ((time_asc) ? ASC : DESC);
@@ -306,6 +312,7 @@
string error_message = Error in find_event_ids: %d, %s.printf (
rc, db.errmsg ());
warning (error_message);
+database.assert_not_corrupt (rc);
throw new EngineError.DATABASE_ERROR (error_message);
}
@@ -458,14 +465,7 @@
// for (int i=0; irelated_uris.length; i++)
//related_uris[i] = temp_related_uris[i];
-if (rc != Sqlite.DONE)
-{
-string error_message =
-Error in find_related_uris: %d, %s.printf (
-rc, db.errmsg ());
-warning (error_message);
-throw new EngineError.DATABASE_ERROR (error_message);
-}
+database.assert_query_success (rc, Error in find_related_uris);
var uri_counter = new HashTablestring, RelatedUri?(
str_hash, str_equal);
=== modified file 'src/engine.vala'
--- src/engine.vala 2012-03-14 14:26:11 +
+++ src/engine.vala 2012-04-05 12:12:49 +
@@ -241,6 +241,7 @@
if ((rc = insert_stmt.step()) != Sqlite.DONE) {
if (rc != Sqlite.CONSTRAINT)
{
+
[Zeitgeist] [Merge] lp:~rainct/zeitgeist/961974 into lp:zeitgeist
The proposal to merge lp:~rainct/zeitgeist/961974 into lp:zeitgeist has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~rainct/zeitgeist/961974/+merge/100946 -- https://code.launchpad.net/~rainct/zeitgeist/961974/+merge/100946 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] [Branch ~zeitgeist/zeitgeist/bluebird] Rev 462: Fix typo.
revno: 462
committer: Siegfried-Angel Gevatter Pujals siegfr...@gevatter.com
branch nick: bluebird
timestamp: Thu 2012-04-05 14:43:45 +0200
message:
Fix typo.
modified:
src/extension-store.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 'src/extension-store.vala'
--- src/extension-store.vala 2012-04-05 12:12:49 +
+++ src/extension-store.vala 2012-04-05 12:43:45 +
@@ -109,7 +109,7 @@
{
database.assert_not_corrupt (rc);
}
-catch (EngineError) { }
+catch (EngineError err) { }
warning (SQL error: %d, %s, rc, db.errmsg ());
}
return null;
___
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] [Branch ~zeitgeist/zeitgeist/bluebird] Rev 463: Some fixes for lp:~rainct/zeitgeist/961974
revno: 463
committer: Siegfried-Angel Gevatter Pujals siegfr...@gevatter.com
branch nick: bluebird
timestamp: Thu 2012-04-05 14:59:44 +0200
message:
Some fixes for lp:~rainct/zeitgeist/961974
modified:
src/db-reader.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 'src/db-reader.vala'
--- src/db-reader.vala 2012-04-05 12:12:49 +
+++ src/db-reader.vala 2012-04-05 12:59:44 +
@@ -465,7 +465,8 @@
// for (int i=0; irelated_uris.length; i++)
//related_uris[i] = temp_related_uris[i];
-database.assert_query_success (rc, Error in find_related_uris);
+database.assert_query_success (rc, Error in find_related_uris,
+Sqlite.DONE);
var uri_counter = new HashTablestring, RelatedUri?(
str_hash, str_equal);
=== modified file 'src/table-lookup.vala'
--- src/table-lookup.vala 2012-04-05 12:12:49 +
+++ src/table-lookup.vala 2012-04-05 12:59:44 +
@@ -94,7 +94,8 @@
insertion_stmt.reset ();
insertion_stmt.bind_text (1, name);
rc = insertion_stmt.step ();
-database.assert_query_success (rc, Error in id_for_string);
+database.assert_query_success (rc, Error in id_for_string,
+Sqlite.DONE);
id = (int) db.last_insert_rowid ();
@@ -127,7 +128,8 @@
value_to_id.insert (text, id);
rc = retrieval_stmt.step ();
}
-database.assert_query_success (rc, Error in get_value);
+database.assert_query_success (rc, Error in get_value,
+Sqlite.DONE);
if (text == null)
{
critical (Error getting data from table: %d, %s\n,
___
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] [Bug 967056] Re: The privacy section should be renamed, oneiric users think confidential data is sent because there is no option to inhibit this
** Summary changed: - The privacy section should be renamed, oneiric users think confidential data are sent because there is no option to inhibit this + The privacy section should be renamed, oneiric users think confidential data is sent because there is no option to inhibit this ** Also affects: activity-log-manager (Ubuntu) Importance: Undecided Status: New -- You received this bug notification because you are a member of Activity Log Manager, which is the registrant for Activity Log Manager. https://bugs.launchpad.net/bugs/967056 Title: The privacy section should be renamed, oneiric users think confidential data is sent because there is no option to inhibit this Status in Activity Log Manager for Zeitgeist: New Status in “activity-log-manager” package in Ubuntu: New Bug description: Some users think that confidential data are sent in Oneiric because of the new option Privacy (at least in the french community). So this option should be renamed, by instance by Indexing, to show that it permit to configure file indexing and softwares, and not to inhibit data sending through the network to Canonical by instance. To manage notifications about this bug go to: https://bugs.launchpad.net/activity-log-manager/+bug/967056/+subscriptions ___ 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] [Bug 967056] Re: The privacy section should be renamed, oneiric users think confidential data is sent because there is no option to inhibit this
** Also affects: ayatana-design Importance: Undecided Status: New -- You received this bug notification because you are a member of Activity Log Manager, which is the registrant for Activity Log Manager. https://bugs.launchpad.net/bugs/967056 Title: The privacy section should be renamed, oneiric users think confidential data is sent because there is no option to inhibit this Status in Activity Log Manager for Zeitgeist: New Status in Ayatana Design: New Status in “activity-log-manager” package in Ubuntu: New Bug description: Some users think that confidential data are sent in Oneiric because of the new option Privacy (at least in the french community). So this option should be renamed, by instance by Indexing, to show that it permit to configure file indexing and softwares, and not to inhibit data sending through the network to Canonical by instance. To manage notifications about this bug go to: https://bugs.launchpad.net/activity-log-manager/+bug/967056/+subscriptions ___ 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] [Bug 929644] Re: Add filesystem crawler support
** Changed in: activity-log-manager Status: Triaged = Won't Fix -- You received this bug notification because you are a member of Activity Log Manager, which is the registrant for Activity Log Manager. https://bugs.launchpad.net/bugs/929644 Title: Add filesystem crawler support Status in Activity Log Manager for Zeitgeist: Won't Fix Bug description: Previous version of activity-log-manager,we had a feature to crawl the filesystem and look for files which have not been logged. It needs to be added To manage notifications about this bug go to: https://bugs.launchpad.net/activity-log-manager/+bug/929644/+subscriptions ___ 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:~rainct/zeitgeist/rebuild-fts-on-new-db into lp:zeitgeist
Siegfried Gevatter has proposed merging
lp:~rainct/zeitgeist/rebuild-fts-on-new-db into lp:zeitgeist.
Requested reviews:
Zeitgeist Framework Team (zeitgeist)
For more details, see:
https://code.launchpad.net/~rainct/zeitgeist/rebuild-fts-on-new-db/+merge/101024
--
https://code.launchpad.net/~rainct/zeitgeist/rebuild-fts-on-new-db/+merge/101024
Your team Zeitgeist Framework Team is requested to review the proposed merge of
lp:~rainct/zeitgeist/rebuild-fts-on-new-db into lp:zeitgeist.
=== modified file 'extensions/fts++/controller.cpp'
--- extensions/fts++/controller.cpp 2012-04-03 18:40:44 +
+++ extensions/fts++/controller.cpp 2012-04-05 19:10:22 +
@@ -17,6 +17,8 @@
*/
#include controller.h
+#include string
+#include sstream
namespace ZeitgeistFTS {
@@ -81,6 +83,12 @@
// Set the db metadata key only once we're done
PushTask (new MetadataTask (fts_index_version, INDEX_VERSION));
+gint64 zg_creation_date = indexer-GetZeitgeistCreationDate ();
+std::stringstream tmpstream;
+std::string zg_creation_date_str;
+tmpstream zg_creation_date;
+tmpstream zg_creation_date_str;
+PushTask (new MetadataTask (zg_db_creation_date, zg_creation_date_str));
}
g_object_unref (time_range);
=== modified file 'extensions/fts++/indexer.cpp'
--- extensions/fts++/indexer.cpp 2012-04-03 18:40:44 +
+++ extensions/fts++/indexer.cpp 2012-04-05 19:10:22 +
@@ -23,6 +23,8 @@
#include xapian.h
#include queue
#include vector
+#include string
+#include sstream
#include gio/gio.h
#include gio/gdesktopappinfo.h
@@ -146,6 +148,14 @@
}
}
+gint64 Indexer::GetZeitgeistCreationDate ()
+{
+ ZeitgeistSQLiteDatabase *database = zeitgeist_db_reader_get_database (
+ zg_reader);
+ return zeitgeist_sq_lite_database_schema_get_creation_date (
+ database-database);
+}
+
/**
* Returns true if and only if the index is good.
* Otherwise the index should be rebuild.
@@ -164,6 +174,28 @@
return false;
}
+ // Get stored Zeitgeist DB creation date
+ gint64 metadata_date;
+ std::string metadata_date_str (db-get_metadata (zg_db_creation_date));
+ if (metadata_date_str == )
+metadata_date = -1;
+ else
+ {
+std::stringstream tmpstream;
+tmpstream metadata_date_str;
+tmpstream metadata_date;
+ }
+
+ // In case the Zeitgeist DB is newer than Xapian, we need to re-build.
+ // This may happen if the Zeitgeist DB gets corrupt and is re-created
+ // from scratch.
+ gint64 database_creation_date = GetZeitgeistCreationDate ();
+ if (database_creation_date metadata_date)
+ {
+g_message (Zeitgeist database has been replaced. Doing full rebuild);
+return false;
+ }
+
return true;
}
=== modified file 'extensions/fts++/indexer.h'
--- extensions/fts++/indexer.h 2012-04-03 19:01:28 +
+++ extensions/fts++/indexer.h 2012-04-05 19:10:22 +
@@ -80,6 +80,7 @@
void IndexEvent (ZeitgeistEvent *event);
void DeleteEvent (guint32 event_id);
void SetDbMetadata (std::string const key, std::string const value);
+ gint64 GetZeitgeistCreationDate ();
GPtrArray* Search (const gchar *search,
ZeitgeistTimeRange *time_range,
=== modified file 'src/sql-schema.vala'
--- src/sql-schema.vala 2012-04-05 12:12:49 +
+++ src/sql-schema.vala 2012-04-05 19:10:22 +
@@ -38,6 +38,8 @@
public const string CORE_SCHEMA = core;
public const int CORE_SCHEMA_VERSION = 6;
+private const string DATABASE_CREATION = database_creation;
+
public static void ensure_schema (Sqlite.Database database)
throws EngineError
{
@@ -48,6 +50,11 @@
{
// most likely a new DB
create_schema (database);
+
+// set database creation date
+var schema_sql = INSERT INTO schema_version VALUES ('%s', %l64d)
+.printf (DATABASE_CREATION, Timestamp.now ());
+exec_query (database, schema_sql);
}
else if (schema_version == 4 || schema_version == 5)
{
@@ -123,28 +130,44 @@
public static int get_schema_version (Sqlite.Database database)
throws EngineError
{
- var sql = SELECT version FROM schema_version WHERE schema='core';
- int schema_version = -1;
- database.exec (sql,
- (n_cols, values, column_names) =
- {
- if (values[0] != null)
- {
- schema_version = int.parse (values[0]);
- }
- return 0;
- }, null);
-
- // we don't really care about the return value of exec, the result
- // will be -1 if something went wrong anyway
- debug (schema_version is %d, schema_version);
-
- if (schema_version -1)
- {
- throw new EngineError.DATABASE_CORRUPT (
- Database corruption flag is
Re: [Zeitgeist] [Merge] lp:~rainct/zeitgeist/rebuild-fts-on-new-db into lp:zeitgeist
Review: Needs Fixing
114 +var schema_sql = INSERT INTO schema_version VALUES
('%s', %l64d)
Let's use int64.FORMAT here.
--
https://code.launchpad.net/~rainct/zeitgeist/rebuild-fts-on-new-db/+merge/101024
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] [Build #3386029] i386 build of activity-log-manager 0.9.4-0ubuntu3 in ubuntu oneiric RELEASE (zeitgeist PPA)
* Source Package: activity-log-manager * Version: 0.9.4-0ubuntu3 * Architecture: i386 * Archive: zeitgeist PPA * Component: main * State: Failed to build * Duration: 5 minutes * Build Log: https://launchpad.net/~zeitgeist/+archive/ppa/+build/3386029/+files/buildlog_ubuntu-oneiric-i386.activity-log-manager_0.9.4-0ubuntu3_FAILEDTOBUILD.txt.gz * Builder: https://launchpad.net/builders/dubnium * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of activity-log-manager 0.9.4-0ubuntu3 in ubuntu oneiric RELEASE https://launchpad.net/~zeitgeist/+archive/ppa/+build/3386029 ___ 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:~rainct/zeitgeist/rebuild-fts-on-new-db into lp:zeitgeist
Also 74 + if (database_creation_date metadata_date) database_creation_date = 0 should be added -- https://code.launchpad.net/~rainct/zeitgeist/rebuild-fts-on-new-db/+merge/101024 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:~rainct/zeitgeist/rebuild-fts-on-new-db into lp:zeitgeist
OK, updated. Also, shouldn't we insert the schema row also when upgrading a DB from ver 4/5? database_creation_date = 0 should be added Nope, -1 works just fine and saves us having to bump the schema version again for nothing. -- https://code.launchpad.net/~rainct/zeitgeist/rebuild-fts-on-new-db/+merge/101024 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:~rainct/zeitgeist/rebuild-fts-on-new-db into lp:zeitgeist
Review: Needs Fixing
24 +#include sstream
Remove pls.
50 + if (metadata_date_str == )
if (metadata_date_str.empty())
52 + else
53 + {
54 +std::stringstream tmpstream;
55 +tmpstream metadata_date_str;
56 +tmpstream metadata_date;
57 + }
metadata_date = g_ascii_strtoll (metadata_date_str.c_str (), NULL, 0);
--
https://code.launchpad.net/~rainct/zeitgeist/rebuild-fts-on-new-db/+merge/101024
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
