Menu
▾
▴
[Opensync-commits] r5753 - plugins/evolution2/src
|
From: <svn...@op...> - 2009-09-07 00:43:34
|
Author: dgollub Date: Mon Sep 7 02:38:18 2009 New Revision: 5753 URL: http://www.opensync.org/changeset/5753 Log: Implemented initial evolution2 format plugin to convert native capabilities to xmlformat-like capabilities. Added: plugins/evolution2/src/evolution2_format.c Modified: plugins/evolution2/src/CMakeLists.txt plugins/evolution2/src/evolution2_capabilities.c Modified: plugins/evolution2/src/CMakeLists.txt ============================================================================== --- plugins/evolution2/src/CMakeLists.txt Mon Sep 7 02:27:45 2009 (r5752) +++ plugins/evolution2/src/CMakeLists.txt Mon Sep 7 02:38:18 2009 (r5753) @@ -9,10 +9,14 @@ ) OPENSYNC_PLUGIN_ADD( evo2-sync ${evo2_sync_LIB_SRCS} ) +OPENSYNC_FORMAT_ADD( evo2-format evolution2_format.c ) TARGET_LINK_LIBRARIES( evo2-sync ${LIBEBOOK_LIBRARIES} ${LIBECAL_LIBRARIES} ${LIBEDATABOOK_LIBRARIES} ${LIBEDATACAL_LIBRARIES} ${LIBEDATASERVER_LIBRARIES} ${OPENSYNC_LIBRARIES} ) +TARGET_LINK_LIBRARIES( evo2-format ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ) ###### INSTALL ################### OPENSYNC_PLUGIN_INSTALL( evo2-sync ) - OPENSYNC_PLUGIN_CONFIG( evo2-sync ) + +OPENSYNC_FORMAT_INSTALL( evo2-format ) + Modified: plugins/evolution2/src/evolution2_capabilities.c ============================================================================== --- plugins/evolution2/src/evolution2_capabilities.c Mon Sep 7 02:27:45 2009 (r5752) +++ plugins/evolution2/src/evolution2_capabilities.c Mon Sep 7 02:38:18 2009 (r5753) @@ -25,78 +25,10 @@ #include "evolution2_capabilities.h" -#define cast_g_hash_table_insert(hash, a, b) g_hash_table_insert(hash, (gpointer) a, (gpointer) b) - -static GHashTable* get_ebook_to_xmlformat_hash() -{ - osync_trace(TRACE_ENTRY, "%s", __func__); - GHashTable *hash = g_hash_table_new(g_str_hash, g_str_equal); - - cast_g_hash_table_insert(hash, "address", "Address"); - cast_g_hash_table_insert(hash, "address_label_home", "AddressLabel"); - cast_g_hash_table_insert(hash, "address_label_other", "AddressLabel"); - cast_g_hash_table_insert(hash, "address_label_work", "AddressLabel"); - cast_g_hash_table_insert(hash, "anniversary", "Anniversary"); - cast_g_hash_table_insert(hash, "assistant", "Assistant"); - cast_g_hash_table_insert(hash, "birth_date", "Birthday"); - cast_g_hash_table_insert(hash, "blog_url", "BlogUrl"); - cast_g_hash_table_insert(hash, "caluri", "CalendarUrl"); - cast_g_hash_table_insert(hash, "categories", "Categories"); - /* cast_g_hash_table_insert(hash, "", "Class");*/ - cast_g_hash_table_insert(hash, "email_1", "EMail"); - cast_g_hash_table_insert(hash, "email_2", "EMail"); - cast_g_hash_table_insert(hash, "email_3", "EMail"); - cast_g_hash_table_insert(hash, "email_4", "EMail"); - cast_g_hash_table_insert(hash, "email", "EMail"); - cast_g_hash_table_insert(hash, "file_as", "FileAs"); - cast_g_hash_table_insert(hash, "full_name", "FormattedName"); - cast_g_hash_table_insert(hash, "fburl", "FreeBusyUrl"); - /* cast_g_hash_table_insert(hash, "", "GroupwiseDirectory");*/ - cast_g_hash_table_insert(hash, "im_aim", "IM-AIM"); - cast_g_hash_table_insert(hash, "im_gadugadu", "IM-GaduGadu"); - cast_g_hash_table_insert(hash, "im_icq", "IM-ICQ"); - cast_g_hash_table_insert(hash, "im_jabber", "IM-Jabber"); - cast_g_hash_table_insert(hash, "im_msn", "IM-MSN"); - /* cast_g_hash_table_insert(hash, "", "IM-Yabber");*/ - cast_g_hash_table_insert(hash, "im_yahoo", "IM-Yahoo"); - /* cast_g_hash_table_insert(hash, "", "IRC");*/ - /* cast_g_hash_table_insert(hash, "", "KDE-Extension");*/ - /* cast_g_hash_table_insert(hash, "", "Key");*/ - /* cast_g_hash_table_insert(hash, "", "Location");*/ - cast_g_hash_table_insert(hash, "logo", "Logo"); - cast_g_hash_table_insert(hash, "manager", "Manager"); - cast_g_hash_table_insert(hash, "name", "Name"); - cast_g_hash_table_insert(hash, "nickname", "Nickname"); - cast_g_hash_table_insert(hash, "note", "Note"); - cast_g_hash_table_insert(hash, "org", "Organization"); - cast_g_hash_table_insert(hash, "photo", "Photo"); - /*cast_g_hash_table_insert(hash, "", "PhotoUrl");*/ - - /*To match the vcard translators view that evolution role is really profession */ - cast_g_hash_table_insert(hash, "role", "Profession"); - cast_g_hash_table_insert(hash, "Rev", "Revision"); - /* cast_g_hash_table_insert(hash, "", "Role"); Evolution's role is profession */ - /* cast_g_hash_table_insert(hash, "", "SMS");*/ - /* cast_g_hash_table_insert(hash, "", "Sound");*/ - cast_g_hash_table_insert(hash, "spouse", "Spouse"); - cast_g_hash_table_insert(hash, "phone", "Telephone"); - cast_g_hash_table_insert(hash, "title", "Title"); - cast_g_hash_table_insert(hash, "id", "Uid"); - cast_g_hash_table_insert(hash, "homepage_url", "Url"); - /* cast_g_hash_table_insert(hash, "", "UserDefined");*/ - /* cast_g_hash_table_insert(hash, "", "Version");*/ - cast_g_hash_table_insert(hash, "video_url", "VideoUrl"); - cast_g_hash_table_insert(hash, "wants_html", "WantsHtml"); - - osync_trace(TRACE_EXIT, "%s", __func__); - return hash; -} - -osync_bool evo2_translate_capabilities(OSyncCapabilities *caps, GHashTable *hash, GList *fields, const char *objtype, OSyncError **error) +osync_bool evo2_translate_capabilities(OSyncCapabilities *caps, GList *fields, const char *objtype, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %p)", __func__, caps, hash, fields, objtype, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %p)", __func__, caps, fields, objtype, error); osync_assert(caps); - osync_assert(hash); osync_assert(fields); osync_assert(objtype); @@ -104,19 +36,6 @@ for(; fields; fields = g_list_next(fields)) { -#if 0 - const char *value = g_hash_table_lookup(hash, fields->data); - if (value == NULL) { - osync_trace(TRACE_INTERNAL, "%s: ebook capability '%s' could not be translated", __func__, fields->data); - } else { - osync_trace(TRACE_INTERNAL, "%s: ebook capability '%s' translated to '%s'", __func__, fields->data, value); - /* TODO Check for uniqueness of the added capability as several fields - translate to the same capability */ - if (!osync_capability_new(caps, objtype, value, error)) { - goto error; - } - } -#endif OSyncCapability *cap = osync_capability_new(capsobjtype, error); if (!cap) goto error; @@ -133,7 +52,5 @@ } osync_bool evo2_capbilities_translate_ebook(OSyncCapabilities *caps, GList *fields, OSyncError **error) { - GHashTable *hash; - hash = get_ebook_to_xmlformat_hash(); - return evo2_translate_capabilities(caps, hash, fields, "contact", error); + return evo2_translate_capabilities(caps, fields, "contact", error); } Added: plugins/evolution2/src/evolution2_format.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ plugins/evolution2/src/evolution2_format.c Mon Sep 7 02:38:18 2009 (r5753) @@ -0,0 +1,167 @@ +/* + * evolution2_format - A evolution2 format plugin for the OpenSync framework + * Copyright (C) 2009 Daniel Gollub <go...@b1...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <glib.h> + +#include <opensync/opensync.h> +#include <opensync/opensync-capabilities.h> +#include <opensync/opensync-format.h> + +#define cast_g_hash_table_insert(hash, a, b) g_hash_table_insert(hash, (gpointer) a, (gpointer) b) + +static GHashTable* get_ebook_to_xmlformat_hash() +{ + osync_trace(TRACE_ENTRY, "%s", __func__); + GHashTable *hash = g_hash_table_new(g_str_hash, g_str_equal); + + cast_g_hash_table_insert(hash, "address", "Address"); + cast_g_hash_table_insert(hash, "address_label_home", "AddressLabel"); + cast_g_hash_table_insert(hash, "address_label_other", "AddressLabel"); + cast_g_hash_table_insert(hash, "address_label_work", "AddressLabel"); + cast_g_hash_table_insert(hash, "anniversary", "Anniversary"); + cast_g_hash_table_insert(hash, "assistant", "Assistant"); + cast_g_hash_table_insert(hash, "birth_date", "Birthday"); + cast_g_hash_table_insert(hash, "blog_url", "BlogUrl"); + cast_g_hash_table_insert(hash, "caluri", "CalendarUrl"); + cast_g_hash_table_insert(hash, "categories", "Categories"); + /* cast_g_hash_table_insert(hash, "", "Class");*/ + cast_g_hash_table_insert(hash, "email_1", "EMail"); + cast_g_hash_table_insert(hash, "email_2", "EMail"); + cast_g_hash_table_insert(hash, "email_3", "EMail"); + cast_g_hash_table_insert(hash, "email_4", "EMail"); + cast_g_hash_table_insert(hash, "email", "EMail"); + cast_g_hash_table_insert(hash, "file_as", "FileAs"); + cast_g_hash_table_insert(hash, "full_name", "FormattedName"); + cast_g_hash_table_insert(hash, "fburl", "FreeBusyUrl"); + /* cast_g_hash_table_insert(hash, "", "GroupwiseDirectory");*/ + cast_g_hash_table_insert(hash, "im_aim", "IM-AIM"); + cast_g_hash_table_insert(hash, "im_gadugadu", "IM-GaduGadu"); + cast_g_hash_table_insert(hash, "im_icq", "IM-ICQ"); + cast_g_hash_table_insert(hash, "im_jabber", "IM-Jabber"); + cast_g_hash_table_insert(hash, "im_msn", "IM-MSN"); + /* cast_g_hash_table_insert(hash, "", "IM-Yabber");*/ + cast_g_hash_table_insert(hash, "im_yahoo", "IM-Yahoo"); + /* cast_g_hash_table_insert(hash, "", "IRC");*/ + /* cast_g_hash_table_insert(hash, "", "KDE-Extension");*/ + /* cast_g_hash_table_insert(hash, "", "Key");*/ + /* cast_g_hash_table_insert(hash, "", "Location");*/ + cast_g_hash_table_insert(hash, "logo", "Logo"); + cast_g_hash_table_insert(hash, "manager", "Manager"); + cast_g_hash_table_insert(hash, "name", "Name"); + cast_g_hash_table_insert(hash, "nickname", "Nickname"); + cast_g_hash_table_insert(hash, "note", "Note"); + cast_g_hash_table_insert(hash, "org", "Organization"); + cast_g_hash_table_insert(hash, "photo", "Photo"); + /*cast_g_hash_table_insert(hash, "", "PhotoUrl");*/ + + /*To match the vcard translators view that evolution role is really profession */ + cast_g_hash_table_insert(hash, "role", "Profession"); + cast_g_hash_table_insert(hash, "Rev", "Revision"); + /* cast_g_hash_table_insert(hash, "", "Role"); Evolution's role is profession */ + /* cast_g_hash_table_insert(hash, "", "SMS");*/ + /* cast_g_hash_table_insert(hash, "", "Sound");*/ + cast_g_hash_table_insert(hash, "spouse", "Spouse"); + cast_g_hash_table_insert(hash, "phone", "Telephone"); + cast_g_hash_table_insert(hash, "title", "Title"); + cast_g_hash_table_insert(hash, "id", "Uid"); + cast_g_hash_table_insert(hash, "homepage_url", "Url"); + /* cast_g_hash_table_insert(hash, "", "UserDefined");*/ + /* cast_g_hash_table_insert(hash, "", "Version");*/ + cast_g_hash_table_insert(hash, "video_url", "VideoUrl"); + cast_g_hash_table_insert(hash, "wants_html", "WantsHtml"); + + osync_trace(TRACE_EXIT, "%s", __func__); + return hash; +} + + +osync_bool caps_conv_generic(OSyncCapabilities *oldcaps, OSyncCapabilities *newcaps, const char *objtype, GHashTable *hash, OSyncError **error) +{ + + OSyncCapabilitiesObjType *newcapsobjtype, *capsobjtype = osync_capabilities_get_objtype(oldcaps, objtype); + OSyncList *c, *oldcapslist = osync_capabilities_objtype_get_caps(capsobjtype); + + newcapsobjtype = osync_capabilities_objtype_new(newcaps, objtype, error); + if (!newcapsobjtype) + goto error; + + for (c = oldcapslist; c; c = c->next) { + OSyncCapability *oldcap = (OSyncCapability *) c->data; + const char *name = osync_capability_get_name(oldcap); + const char *new_name = g_hash_table_lookup(hash, name); + if (!new_name) { + osync_trace(TRACE_INTERNAL, "Couldn't find counter-part for capability \"%s\"", __NULLSTR(name)); + continue; + } + + OSyncCapability *newcap = osync_capability_new(newcapsobjtype, error); + if (!newcap) + goto error; + + osync_capability_set_name(newcap, new_name); + } + + + return TRUE; +error: + return FALSE; +} + +osync_bool caps_conv_evo2_to_xmlformat(OSyncCapabilities *oldcaps, OSyncCapabilities **newcaps, const char *config, void *userdata, OSyncError **error) +{ + + GHashTable *ebook_hash = get_ebook_to_xmlformat_hash(); + + + *newcaps = osync_capabilities_new("xmlformat" ,error); + if (!*newcaps) + goto error; + + if (!caps_conv_generic(oldcaps, *newcaps, "contact", ebook_hash, error)) + goto error; + + return TRUE; + +error: + return FALSE; +} + +osync_bool get_conversion_info(OSyncFormatEnv *env) +{ + OSyncError *error; + /** Register Caps Converter */ + OSyncCapsConverter *caps_converter = osync_caps_converter_new("evo2-caps", "xmlformat", caps_conv_evo2_to_xmlformat, &error); + if (!caps_converter) + goto error; + + osync_format_env_register_caps_converter(env, caps_converter, &error); + + return TRUE; + +error: + osync_trace(TRACE_ERROR, "%s", osync_error_print(&error)); + osync_error_unref(&error); + return FALSE; +} + +int get_version(void) +{ + return 1; +} |
