Changeset 2549

Timestamp:

10/11/07 01:54:01 (1 year ago)

Author:

gcobb

Message:

gpe-sync: add multiple calendar support

Files:

• plugins/gpe/ChangeLog (modified) (1 diff)
• plugins/gpe/src/gpe-sync (modified) (5 diffs)
• plugins/gpe/src/gpe_sync.c (modified) (6 diffs)
• plugins/gpe/src/gpe_sync.h (modified) (1 diff)
• plugins/gpe/src/gpe_xml.c (modified) (3 diffs)

plugins/gpe/ChangeLog

@@ +1 @@
+2007-10-11  Graham Cobb  <g+770@cobb.uk.net>
+
+        * src/gpe_sync.c, src/gpe_sync.h: Add multiple calendar support
+        * src/gpe_xml.c, src/gpe-sync: Add <calendar> configuration support
+
-2007-10-09  Graham Cobb  <g+770@cobb.uk.net>
-

plugins/gpe/src/gpe-sync

@@ -6 +6 @@
-
-        In this case you can specify <command>shell command</command>
-
-
-
+
+
-
-        2) You can use SSH to connect to the device by specifying the
-
+/
-
-        In this case, the <handheld_ip>, <handheld_user> and <command> 
@@ -28 +27 @@
-        <remote>...</remote> option.
-
-ar
+can b
-
-u
+customi
-  one of the other sections.  Each section is configured to show the default values
-  used if the tags are not specified. 
-  -->
-
-  <ssh>
-    <handheld_ip>127.0.0.1</handheld_ip>
@@ -40 +38 @@
-    <command>gpesyncd --remote</command>
-  </ssh>
-
-  <!--
-  <local>
@@ -46 +43 @@
-  </local>
-  -->
-
-  <!--
-  <remote>
@@ -54 +50 @@
-  -->
-
+  <!--
+  The <calendar> tag can be used to specify which GPE calendar
+  should be used for this synchronisation.  If the <calendar>
+  tag is specified then only the named calendar is considered
+  (only events in that calendar wil be sent from GPE and all
+  events sent to GPE will be stored in that calendar).  If the
+  <calendar> tag is not specified, then all events, from all
+  calendars, will be sent from GPE and new events will be created
+  in the default calendar.
+
+  Note that an error occurs if the named calendar does not exist
+  and calendar names are case-sensitive.
+  -->
+  <!-- <calendar>Some Calendar</calendar> -->
-</config>

plugins/gpe/src/gpe_sync.c

@@ -21 +21 @@
-
-#include "gpe_sync.h"
+
+/*! \brief Closes the connection to the databases
+ *
+ * \brief ctx           The context of the plugin
+ */
+static void gpe_disconnect_internal(gpe_environment *env)
+{
+        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p)", __func__, env);
+        
+        if (env->client) {
+                gpesync_client_close (env->client);
+                env->client = NULL;
+        }
+
+        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);
+}
+static void gpe_disconnect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, ctx);
+        gpe_environment *env = ((sink_environment *)userdata)->gpe_env;
+        
+        gpe_disconnect_internal(env);
+
+        //Answer the call
+        osync_context_report_success(ctx);
+        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);
+}
-
-/*! \brief Connects to the databases of GPE
@@ -66 +93 @@
-        }
-        
+        // Set calendar name
+        if (env->calendar) {
+          gchar *response = NULL;
+          gpesync_client_exec_printf(env->client, "path vevent %s", client_callback_string, &response, NULL, env->calendar);
+          if (strncmp(response, "OK", 2) != 0) {
+            osync_context_report_error(ctx, OSYNC_ERROR_MISCONFIGURATION, "calendar %s not found", 
+                          env->calendar);
+            osync_trace(TRACE_EXIT_ERROR, "GPE-SYNC %s: calendar %s not found", 
+                      __func__, env->calendar);
+            gpe_disconnect_internal(env);
+            g_free(response);
+            return;
+          }
+          g_free(response);
+        }
+
-        osync_context_report_success(ctx);
-
@@ -78 +121 @@
-{
-        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, ctx);
-
+//
-
-        //If we use anchors we have to update it now.
-        
-        //Answer the call
-        osync_context_report_success(ctx);
-        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);
-}
-
-/*! \brief Closes the connection to the databases
- *
- * \brief ctx           The context of the plugin
- */
-static void gpe_disconnect_internal(gpe_environment *env)
-{
-        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p)", __func__, env);
-        
-        if (env->client) {
-                gpesync_client_close (env->client);
-                env->client = NULL;
-        }
-
-        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);
-}
-static void gpe_disconnect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
-{
-        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, ctx);
-        gpe_environment *env = ((sink_environment *)userdata)->gpe_env;
-        
-        gpe_disconnect_internal(env);
-
-        //Answer the call
-        osync_context_report_success(ctx);
@@ -241 +257 @@
-          osync_trace(TRACE_EXIT_ERROR, "GPE-SYNC %s: gpesyncd version %d.%d not supported -- require %d.%d", 
-                      __func__, v_major, v_minor, MIN_PROTOCOL_MAJOR, MIN_PROTOCOL_MINOR);
+          g_free(response);
-          return FALSE;
-        }
@@ -255 +272 @@
-        g_free(version_string);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // GPE always supports contacts, todos and events
-        if (env->contact_sink.sink) osync_objtype_sink_set_available(env->contact_sink.sink, TRUE);
@@ -264 +305 @@
-        gpe_disconnect_internal(env);
-
+        g_free(response);
-        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);
-        return TRUE;

plugins/gpe/src/gpe_sync.h

@@ -68 +68 @@
-        int use_local;
-        int use_remote;
+        char *calendar; // Name of GPE calendar to use or NULL
-        
-        int debuglevel;

plugins/gpe/src/gpe_xml.c

@@ -41 +41 @@
-        env->use_remote = 0;
-        env->debuglevel = 0;
+        env->calendar = NULL;
-        
-        xmlInitParser();
@@ -53 +54 @@
-        ctx = xmlXPathNewContext(doc);
-
-
+of 
-        obj = xmlXPathEval("/config/local", ctx);
-        if (obj && obj->nodesetval && obj->nodesetval->nodeNr) {
@@ -149 +150 @@
-
-        if (obj) xmlXPathFreeObject(obj);
+        obj = xmlXPathEval("//calendar/text()", ctx);
+        if (obj && obj->nodesetval && obj->nodesetval->nodeNr) {
+          xmlChar *str=xmlXPathCastToString(obj);
+          env->calendar = g_strdup(str);
+          xmlFree(str);
+          osync_trace(TRACE_INTERNAL, "GPE-SYNC %s: <calendar> = %s", __func__, env->calendar);
+        }
+
+        if (obj) xmlXPathFreeObject(obj);
-        xmlXPathFreeContext(ctx);
-        xmlFreeDoc(doc);