Merge lp:~rainct/libzeitgeist/986099 into lp:libzeitgeist

[Siegfried Gevatter]

[lp:~rainct/libzeitgeist/986099]

238. By Siegfried Gevatter on 2012-04-23

Update Vala bindings.

[Michal Hruby (mhr3)]

Looks good to me, although it's a hidden API not-really-break. Not sure if this should go in the 0.3 series.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Heh, good question... Do we know if this API has any consumers? The latest yelp additions maybe?

[Mikkel Kamstrup Erlandsen (kamstrup)]

For the record, I'll +1 this if we a reasonably sure we arent' gonna break some clients. (FWIW - the ABI remains the same... so we shouldn't break installed apps, some may need patching to compile again though)

Unmerged revisions

238. By Siegfried Gevatter on 2012-04-23

Update Vala bindings.

237. By Siegfried Gevatter on 2012-04-23

Fix find_related_uris result type (add missing RelevantResultType)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-04-23 19:40:26 +0000
@@ -0,0 +1,1 @@
+find-related

=== modified file 'bindings/zeitgeist-1.0.gi'
--- bindings/zeitgeist-1.0.gi	2012-04-03 12:04:23 +0000
+++ bindings/zeitgeist-1.0.gi	2012-04-23 19:40:26 +0000
@@ -150,6 +150,10 @@
 				<parameter name="tv" type="GTimeVal*"/>
 			</parameters>
 		</function>
+		<enum name="ZeitgeistRelevantResultType" type-name="ZeitgeistRelevantResultType" get-type="zeitgeist_relevant_result_type_get_type">
+			<member name="ZEITGEIST_RELEVANT_RESULT_TYPE_RECENT" value="0"/>
+			<member name="ZEITGEIST_RELEVANT_RESULT_TYPE_RELATED" value="1"/>
+		</enum>
 		<enum name="ZeitgeistResultType" type-name="ZeitgeistResultType" get-type="zeitgeist_result_type_get_type">
 			<member name="ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS" value="0"/>
 			<member name="ZEITGEIST_RESULT_TYPE_LEAST_RECENT_EVENTS" value="1"/>
@@ -688,7 +692,7 @@
 					<parameter name="result_event_templates" type="GPtrArray*"/>
 					<parameter name="storage_state" type="ZeitgeistStorageState"/>
 					<parameter name="num_events" type="guint32"/>
-					<parameter name="result_type" type="ZeitgeistResultType"/>
+					<parameter name="result_type" type="ZeitgeistRelevantResultType"/>
 					<parameter name="cancellable" type="GCancellable*"/>
 					<parameter name="callback" type="GAsyncReadyCallback"/>
 					<parameter name="user_data" type="gpointer"/>

=== modified file 'bindings/zeitgeist-1.0.vapi'
--- bindings/zeitgeist-1.0.vapi	2012-04-04 15:31:01 +0000
+++ bindings/zeitgeist-1.0.vapi	2012-04-23 19:40:26 +0000
@@ -127,7 +127,7 @@
 		public async GLib.Array find_event_ids (Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, Zeitgeist.StorageState storage_state, uint32 num_events, Zeitgeist.ResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
 		public async Zeitgeist.ResultSet find_events (Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, Zeitgeist.StorageState storage_state, uint32 num_events, Zeitgeist.ResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
 		[CCode (array_length = false, array_null_terminated = true)]
-		public async string[] find_related_uris (Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, owned GLib.PtrArray result_event_templates, Zeitgeist.StorageState storage_state, uint32 num_events, Zeitgeist.ResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async string[] find_related_uris (Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, owned GLib.PtrArray result_event_templates, Zeitgeist.StorageState storage_state, uint32 num_events, Zeitgeist.RelevantResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
 		public static unowned Zeitgeist.Log get_default ();
 		public async Zeitgeist.ResultSet get_events (owned GLib.Array event_ids, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void get_version (out int major, out int minor, out int micro);
@@ -210,6 +210,11 @@
 		public abstract uint size ();
 		public abstract uint tell ();
 	}
+	[CCode (cheader_filename = "zeitgeist.h", cprefix = "ZEITGEIST_RELEVANT_RESULT_TYPE_")]
+	public enum RelevantResultType {
+		RECENT,
+		RELATED
+	}
 	[CCode (cheader_filename = "zeitgeist.h", cprefix = "ZEITGEIST_RESULT_TYPE_")]
 	public enum ResultType {
 		MOST_RECENT_EVENTS,

=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2011-02-07 13:13:11 +0000
+++ examples/Makefile.am	2012-04-23 19:40:26 +0000
@@ -10,6 +10,7 @@
 
 noinst_PROGRAMS = \
   find-events \
+  find-related \
   monitor-events \
   search-events
 
@@ -17,10 +18,12 @@
   find-events-alt.vala \
   insert-event.vala
 
-
 find_events_SOURCES = find-events.c
 find_events_LDADD   = $(zeitgeist_libs)
 
+find_related_SOURCES = find-related.c
+find_related_LDADD   = $(zeitgeist_libs)
+
 monitor_events_SOURCES = monitor-events.c
 monitor_events_LDADD   = $(zeitgeist_libs)
 

=== added file 'examples/find-related.c'
--- examples/find-related.c	1970-01-01 00:00:00 +0000
+++ examples/find-related.c	2012-04-23 19:40:26 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2010, 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ * Authored by Siegfried-Angel Gevatter Pujals <[e-mail]>
+ *
+ */
+
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib-object.h>
+#include <zeitgeist.h>
+
+static void
+on_uris_received (ZeitgeistLog  *log,
+                  GAsyncResult *res,
+                  gpointer      user_data)
+{
+  gchar     **uris;
+  GError    *error;
+  GMainLoop *mainloop = (GMainLoop*) user_data;
+  gint       i;
+  
+  error = NULL;
+  uris = zeitgeist_log_find_related_uris_finish (log, res, &error);
+
+  if (error)
+    {
+      g_warning ("Error reading results: %s", error->message);
+      g_error_free (error);
+      g_main_loop_quit (mainloop);
+      return;
+    }
+
+  g_printf ("Related URIs:\n");
+
+  while (*uris != NULL)
+    {
+      g_printf (" - %s\n", *uris);
+      g_free (*uris);
+      *uris++;
+    }
+
+  g_main_loop_quit (mainloop);
+}
+
+gint
+main (gint   argc,
+      gchar *argv[])
+{
+  GMainLoop          *mainloop;
+  ZeitgeistLog       *log;
+  ZeitgeistEvent     *event_tmpl;
+  ZeitgeistSubject   *subject_tmpl;
+  GPtrArray          *templates, *result_templates;
+
+  g_type_init ();
+
+  if (argc != 2)
+  {
+    g_printerr ("Usage: %s <uri>\n", argv[0]);
+    return 1;
+  }
+
+  mainloop = g_main_loop_new (NULL, FALSE);
+  log = g_object_new (ZEITGEIST_TYPE_LOG, NULL);
+
+  templates = g_ptr_array_new ();
+  subject_tmpl = zeitgeist_subject_new ();
+  zeitgeist_subject_set_uri (subject_tmpl, argv[1]);
+  event_tmpl = zeitgeist_event_new ();
+  zeitgeist_event_add_subject (event_tmpl, subject_tmpl);
+  g_ptr_array_add (templates, event_tmpl);
+
+  result_templates = g_ptr_array_new ();
+  //g_ptr_array_add (result_templates, zeitgeist_event_new ());
+
+  zeitgeist_log_find_related_uris (log,
+                                   zeitgeist_time_range_new_to_now (),
+                                   templates,
+                                   result_templates,
+                                   ZEITGEIST_STORAGE_STATE_ANY,
+                                   10,
+                                   ZEITGEIST_RELEVANT_RESULT_TYPE_RELATED,
+                                   NULL,
+                                   (GAsyncReadyCallback) on_uris_received,
+                                   mainloop);
+
+  g_main_loop_run (mainloop);
+
+  return 0;
+}

=== modified file 'src/zeitgeist-enums.h'
--- src/zeitgeist-enums.h	2012-04-03 12:01:54 +0000
+++ src/zeitgeist-enums.h	2012-04-23 19:40:26 +0000
@@ -114,6 +114,20 @@
 } ZeitgeistResultType;
 
 /**
+ * ZeitgeistRelevantResultType:
+ * @ZEITGEIST_RELEVANT_RESULT_TYPE_RECENT: Ordered by recency
+ * @ZEITGEIST_RELEVANT_RESULT_TYPE_RELATED: Ordered by relatedness
+ *
+ * Used to control how "related events" query results are grouped and sorted.
+ * See zeitgeist_log_find_related_uris().
+ */
+typedef enum
+{
+  ZEITGEIST_RELEVANT_RESULT_TYPE_RECENT = 0,
+  ZEITGEIST_RELEVANT_RESULT_TYPE_RELATED = 1,
+} ZeitgeistRelevantResultType;
+
+/**
  * ZeitgeistStorageState:
  * @ZEITGEIST_STORAGE_STATE_NOT_AVAILABLE: The subject is not available right now
  * @ZEITGEIST_STORAGE_STATE_AVAILABLE: The subject is available

=== modified file 'src/zeitgeist-log.c'
--- src/zeitgeist-log.c	2012-03-26 11:03:34 +0000
+++ src/zeitgeist-log.c	2012-04-23 19:40:26 +0000
@@ -867,7 +867,7 @@
                                  GPtrArray           *result_event_templates,
                                  ZeitgeistStorageState storage_state,
                                  guint32              num_events,
-                                 ZeitgeistResultType  result_type,
+                                 ZeitgeistRelevantResultType  result_type,
                                  GCancellable        *cancellable,
                                  GAsyncReadyCallback  callback,
                                  gpointer             user_data)

=== modified file 'src/zeitgeist-log.h'
--- src/zeitgeist-log.h	2012-02-13 11:07:20 +0000
+++ src/zeitgeist-log.h	2012-04-23 19:40:26 +0000
@@ -135,7 +135,7 @@
                                                  GPtrArray           *result_event_templates,
                                                  ZeitgeistStorageState storage_state,
                                                  guint32              num_events,
-                                                 ZeitgeistResultType  result_type,
+                                                 ZeitgeistRelevantResultType  result_type,
                                                  GCancellable        *cancellable,
                                                  GAsyncReadyCallback  callback,
                                                  gpointer             user_data);