Add storage state parameter to the SearchWithRelevancies method

8 files changed, 26 insertions, 9 deletions

diff --git a/extensions/fts++/fts.cpp b/extensions/fts++/fts.cpp
index 3e78d2da..985b6c43 100644
--- a/extensions/fts++/fts.cpp
+++ b/extensions/fts++/fts.cpp
@@ -89,6 +89,7 @@ zeitgeist_indexer_search_with_relevancies (ZeitgeistIndexer *indexer,
                                            const gchar *search_string,
                                            ZeitgeistTimeRange *time_range,
                                            GPtrArray *templates,
+                                           ZeitgeistStorageState storage_state,
                                            guint offset,
                                            guint count,
                                            ZeitgeistResultType result_type,
@@ -108,8 +109,8 @@ zeitgeist_indexer_search_with_relevancies (ZeitgeistIndexer *indexer,
   _indexer = (ZeitgeistFTS::Controller*) indexer;
 
   results = _indexer->indexer->SearchWithRelevancies (
-      search_string, time_range, templates, offset, count, result_type,
-      relevancies, relevancies_size, matches, error);
+      search_string, time_range, templates, storage_state, offset, count,
+      result_type, relevancies, relevancies_size, matches, error);
 
   return results;
 }
diff --git a/extensions/fts++/fts.h b/extensions/fts++/fts.h
index 4c6eb4aa..612dec22 100644
--- a/extensions/fts++/fts.h
+++ b/extensions/fts++/fts.h
@@ -48,6 +48,7 @@ GPtrArray*         zeitgeist_indexer_search_with_relevancies
                                                     const gchar *search_string,
                                                     ZeitgeistTimeRange *time_range,
                                                     GPtrArray *templates,
+                                                    ZeitgeistStorageState storage_state,
                                                     guint offset,
                                                     guint count,
                                                     ZeitgeistResultType result_type,
diff --git a/extensions/fts++/fts.vapi b/extensions/fts++/fts.vapi
index db099943..d8c7bdd1 100644
--- a/extensions/fts++/fts.vapi
+++ b/extensions/fts++/fts.vapi
@@ -18,6 +18,7 @@ namespace Zeitgeist {
                                             string search_string,
                                             TimeRange time_range,
                                             GLib.GenericArray<Event> templates,
+                                            StorageState storage_state,
                                             uint offset,
                                             uint count,
                                             ResultType result_type,
diff --git a/extensions/fts++/indexer.cpp b/extensions/fts++/indexer.cpp
index 04b9ac5a..8b355548 100644
--- a/extensions/fts++/indexer.cpp
+++ b/extensions/fts++/indexer.cpp
@@ -825,6 +825,7 @@ GPtrArray* Indexer::Search (const gchar *search,
 GPtrArray* Indexer::SearchWithRelevancies (const gchar *search,
                                            ZeitgeistTimeRange *time_range,
                                            GPtrArray *templates,
+                                           ZeitgeistStorageState storage_state,
                                            guint offset,
                                            guint count,
                                            ZeitgeistResultType result_type,
@@ -849,6 +850,15 @@ GPtrArray* Indexer::SearchWithRelevancies (const gchar *search,
       enquire->set_sort_by_value (VALUE_TIMESTAMP, true);
     }
 
+    if (storage_state != ZEITGEIST_STORAGE_STATE_ANY)
+    {
+      g_set_error_literal (error,
+                           ZEITGEIST_ENGINE_ERROR,
+                           ZEITGEIST_ENGINE_ERROR_INVALID_ARGUMENT,
+                           "Only ANY stogate state is supported");
+      return NULL;
+    }
+
     Xapian::Query q(query_parser->parse_query (query_string, QUERY_PARSER_FLAGS));
     enquire->set_query (q);
     Xapian::MSet hits (enquire->get_mset (offset, maxhits));
diff --git a/extensions/fts++/indexer.h b/extensions/fts++/indexer.h
index 5b505635..fb55d777 100644
--- a/extensions/fts++/indexer.h
+++ b/extensions/fts++/indexer.h
@@ -88,6 +88,7 @@ public:
   GPtrArray* SearchWithRelevancies (const gchar *search,
                                     ZeitgeistTimeRange *time_range,
                                     GPtrArray *templates,
+                                    ZeitgeistStorageState storage_state,
                                     guint offset,
                                     guint count,
                                     ZeitgeistResultType result_type,
diff --git a/extensions/fts++/zeitgeist-fts.vala b/extensions/fts++/zeitgeist-fts.vala
index b491302d..79bc1905 100644
--- a/extensions/fts++/zeitgeist-fts.vala
+++ b/extensions/fts++/zeitgeist-fts.vala
@@ -135,7 +135,8 @@ namespace Zeitgeist
         public async void search_with_relevancies (
                                   string query_string, Variant time_range,
                                   Variant filter_templates,
-                                  uint offset, uint count, uint result_type,
+                                  uint storage_state, uint offset,
+                                  uint count, uint result_type,
                                   out Variant events, out double[] relevancies,
                                   out uint matches)
             throws Error
@@ -143,8 +144,9 @@ namespace Zeitgeist
             var tr = new TimeRange.from_variant (time_range);
             var templates = Events.from_variant (filter_templates);
             var results = instance.indexer.search_with_relevancies (
-                    query_string, tr, templates, offset, count,
-                    (ResultType) result_type, out relevancies, out matches);
+                    query_string, tr, templates, (StorageState) storage_state,
+                    offset, count, (ResultType) result_type,
+                    out relevancies, out matches);
 
             events = Events.to_variant (results);
         }
diff --git a/extensions/fts.vala b/extensions/fts.vala
index 2ef99d6c..1bc1563f 100644
--- a/extensions/fts.vala
+++ b/extensions/fts.vala
@@ -35,7 +35,7 @@ namespace Zeitgeist
             string query_string,
             [DBus (signature = "(xx)")] Variant time_range,
             [DBus (signature = "a(asaasay)")] Variant filter_templates,
-            uint offset, uint count, uint result_type,
+            uint storage_state, uint offset, uint count, uint result_type,
             [DBus (signature = "a(asaasay)")] out Variant events,
             out double[] relevancies,
             out uint matches) throws Error;
@@ -164,7 +164,8 @@ namespace Zeitgeist
 
         public async void search_with_relevancies (
             string query_string, Variant time_range,
-            Variant filter_templates, uint offset, uint count, uint result_type,
+            Variant filter_templates, uint storage_state,
+            uint offset, uint count, uint result_type,
             out Variant events, out double[] relevancies, out uint matches)
             throws Error
         {
@@ -173,7 +174,7 @@ namespace Zeitgeist
             var timer = new Timer ();
             yield siin.search_with_relevancies (
                 query_string, time_range, filter_templates,
-                offset, count, result_type,
+                storage_state, offset, count, result_type,
                 out events, out relevancies, out matches);
 
             debug ("Got %u[/%u] results from indexer (in %f seconds)",
diff --git a/src/remote.vala b/src/remote.vala
index d4a9261a..9c780521 100644
--- a/src/remote.vala
+++ b/src/remote.vala
@@ -125,7 +125,7 @@ namespace Zeitgeist
             string query_string,
             [DBus (signature = "(xx)")] Variant time_range,
             [DBus (signature = "a(asaasay)")] Variant filter_templates,
-            uint offset, uint count, uint result_type,
+            uint storage_state, uint offset, uint count, uint result_type,
             [DBus (signature = "a(asaasay)")] out Variant events,
             out double[] relevancies, out uint matches) throws Error;
     }