zeitgeist team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 281
committer: Seif Lotfy <seif@xxxxxxxxx>
branch nick: bluebird
timestamp: Sun 2011-10-09 13:56:22 +0200
message:
  some more fixes
modified:
  extensions/fts.vala
  src/extension-collection.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 'extensions/fts.vala'
--- extensions/fts.vala	2011-10-09 10:42:33 +0000
+++ extensions/fts.vala	2011-10-09 11:56:22 +0000
@@ -31,21 +31,21 @@
     }
 
     [DBus (name = "org.gnome.zeitgeist.SimpleIndexer")]
-    public interface Siin : Object {
+    public interface Siin : Object 
+    {
         [DBus (signature = "a(asaasay)u")]
-        public signal Variant search (
+        public abstract Variant search (
             string query_string,
             [DBus (signature = "(xx)")] Variant time_range,
             [DBus (signature = "a(asaasay)")] Variant filter_templates,
             uint offset, uint count, uint result_type) throws Error;
     }
 
-    public static string FTS_DATABASE_PATH;
-
     class SearchEngine: Extension, RemoteSearchEngine
     {
         
-        private Siin siin = null; 
+        private Siin siin;
+        private uint registration_id;
         
         SearchEngine ()
         {
@@ -58,7 +58,7 @@
             {
                 siin = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.zeitgeist.Index",
                                                     "/org/gnome/zeitgeist/index/activity");
-                                                    
+                warning ("=============================================");
                 var connection = Bus.get_sync (BusType.SESSION, null);
                 registration_id = connection.register_object<RemoteSearchEngine> (
                     "/org/gnome/zeitgeist/index/activity", this);
@@ -67,21 +67,20 @@
             {
                 warning ("%s", err.message);
             }
-
-            // Changes are saved to the DB every few seconds and at unload.
-            Timeout.add_seconds (DISK_WRITE_TIMEOUT, flush, Priority.LOW);
         }
         
         public Variant search (string query_string, Variant time_range, 
             Variant filter_templates, uint offset, uint count, uint result_type)
         {
+            return siin.search (query_string, time_range, filter_templates,
+                offset, count, result_type);
         }
 
     }
 
     [ModuleInit]
 #if BUILTIN_EXTENSIONS
-    public static Type search_engine_init (TypeModule module)
+    public static Type fts_init (TypeModule module)
     {
 #else
     public static Type extension_register (TypeModule module)

=== modified file 'src/extension-collection.vala'
--- src/extension-collection.vala	2011-09-29 15:30:04 +0000
+++ src/extension-collection.vala	2011-10-09 11:56:22 +0000
@@ -47,7 +47,8 @@
                 data_source_registry_init,
                 blacklist_init,
                 histogram_init,
-                storage_monitor_init
+                storage_monitor_init,
+                fts_init
             };
 
             foreach (var func in builtins)
@@ -170,6 +171,7 @@
     private extern static Type blacklist_init (TypeModule mod);
     private extern static Type histogram_init (TypeModule mod);
     private extern static Type storage_monitor_init (TypeModule mod);
+    private extern static Type fts_init (TypeModule mod);
 #endif
 
 }