Changeset 2410

Timestamp:

08/05/07 22:19:56 (1 year ago)

Author:

dgollub

Message:

refactored anchor loading/storing... removed lot of duplicate code...

Files:

• plugins/irmc-sync/src/irmc_sync.c (modified) (20 diffs)
• plugins/irmc-sync/src/irmc_sync.h (modified) (2 diffs)

plugins/irmc-sync/src/irmc_sync.c

@@ -230 +230 @@
-
-/**
-synchronization anchors
+general synchronization anchor
- */
-void load_sync_anchors( irmc_environment *env )
@@ -238 +238 @@
-  irmc_config *config = &(env->config);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  if (!anchor) {
-    config->serial_number = NULL;
@@ -297 +259 @@
-  osync_trace(TRACE_ENTRY, "%s(%p)", __func__, env);
-
-  char anchor[ 1024 ];
-  const irmc_config *config = &(env->config);
-
-  /* TODO: check if sink is active 
-  if (osync_member_objtype_enabled(member, "event")) {
-        if (config->calendar_changecounter >= 0 && strcmp(config->calendar_dbid, "FFFFFF")) {
-                snprintf( anchor, sizeof( anchor ), "%d:%s", config->calendar_changecounter, config->calendar_dbid );
-                osync_anchor_update( env->anchor_path, "event", anchor );
-        } else {
-                osync_trace(TRACE_INTERNAL, "ERROR: Invalid values for event anchor detected.");
-        }
-  } else {
-        osync_trace(TRACE_INTERNAL, "WARNING: Synchronization of events was disabled.");
-  }
- 
-  if (osync_member_objtype_enabled(member, "contact")) {
-        if (config->addressbook_changecounter >= 0 && strcmp(config->addressbook_dbid, "FFFFFF")) {
-                snprintf( anchor, sizeof( anchor ), "%d:%s", config->addressbook_changecounter, config->addressbook_dbid );
-                osync_anchor_update( env->anchor_path, "contact", anchor );
-        } else {
-                osync_trace(TRACE_INTERNAL, "ERROR: Invalid values for contact anchor detected.");
-        }
-  } else {
-        osync_trace(TRACE_INTERNAL, "WARNING: Synchronization of contacts was disabled.");
-  }
-
-  if (osync_member_objtype_enabled(member, "note")) {
-        if (config->notebook_changecounter >= 0 && strcmp(config->notebook_dbid, "FFFFFF")) {
-                snprintf( anchor, sizeof( anchor ), "%d:%s", config->notebook_changecounter, config->notebook_dbid );
-                osync_anchor_update( env->anchor_path, "note", anchor );
-        } else {
-                osync_trace(TRACE_INTERNAL, "ERROR: Invalid values for note anchor detected.");
-        }
-  } else {
-        osync_trace(TRACE_INTERNAL, "WARNING: Synchronization of notes was disabled.");
-  }
-  */
-   
-
-
+
-  osync_trace(TRACE_EXIT, "%s", __func__);
-}
@@ -937 +862 @@
-{
-  osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);                    
+
-  irmc_environment *env = (irmc_environment *)data;
-  irmc_config *config = &(env->config);
+  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+  irmc_database *database = osync_objtype_sink_get_userdata(sink);
+
+  const char *objtype = osync_objtype_sink_get_name(sink);
+
+  char *anchor = osync_anchor_retrieve(env->anchor_path, objtype);
+  if (!anchor) {
+    database->changecounter = 0;
+    database->dbid = NULL;
+  } else {
+    char data[ 256 ];
+    memset( data, 0, sizeof( data ) );
+
+    sscanf( anchor, "%d:%256s", &(database->changecounter), data );
+    database->dbid = g_strdup( data );
+  }
+  g_free( anchor );
-
-  config->obexhandle = irmc_obex_client(config);
@@ -951 +894 @@
-  }
-
-
+general 
-  load_sync_anchors(env);
-
@@ -1019 +962 @@
-  irmc_disconnect(&(env->config));
-
+  save_sync_anchors(env);
+
-  osync_context_report_success(ctx);
-
@@ -1030 +975 @@
-{
-  osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);                        
+
+  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+
-  irmc_environment *env = (irmc_environment *)data;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-  osync_context_report_success(ctx);
@@ -1051 +1007 @@
-  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-  irmc_environment *env = (irmc_environment *)data;
-config *config = &(env->config
+database *database = osync_objtype_sink_get_userdata(sink
-
-  data_type_information datainfo;
@@ -1060 +1016 @@
-  strcpy(datainfo.path_identifier, "cal");
-  strcpy(datainfo.path_extension, "vcs");
-
+
+
-
-  if (!get_generic_changeinfo(env, sink, ctx, &datainfo, &error))
@@ -1086 +1043 @@
-  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-  irmc_environment *env = (irmc_environment *)data;
-config *config = &(env->config
+database *database = osync_objtype_sink_get_userdata(sink
-
-  data_type_information datainfo;
@@ -1095 +1052 @@
-  strcpy(datainfo.path_identifier, "pb");
-  strcpy(datainfo.path_extension, "vcf");
-config->addressbook_
+database->
-
-  if (!get_generic_changeinfo(env, sink, ctx, &datainfo, &error))
@@ -1121 +1078 @@
-  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-  irmc_environment *env = (irmc_environment *)data;
-config *config = &(env->config
+database *database = osync_objtype_sink_get_userdata(sink
-
-  data_type_information datainfo;
@@ -1130 +1087 @@
-  strcpy(datainfo.path_identifier, "nt");
-  strcpy(datainfo.path_extension, "vnt");
-config->notebook_
+database->
-
-  if (!get_generic_changeinfo(env, sink, ctx, &datainfo, &error))
@@ -1291 +1248 @@
-  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-  irmc_environment *env = (irmc_environment *)data;
-config *config = &(env->config
+database *database = osync_objtype_sink_get_userdata(sink
-
-  memset(&datainfo, 0, sizeof(datainfo));
@@ -1298 +1255 @@
-  strcpy(datainfo.path_identifier, "cal");
-  strcpy(datainfo.path_extension, "vcs");
-config->calendar_
+database->
-
-  irmcGenericCommitChange(env, sink, ctx, &datainfo, change);
@@ -1314 +1271 @@
-  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-  irmc_environment *env = (irmc_environment *)data;
-config *config = &(env->config
+database *database = osync_objtype_sink_get_userdata(sink
-
-  memset(&datainfo, 0, sizeof(datainfo));
@@ -1321 +1278 @@
-  strcpy(datainfo.path_identifier, "pb");
-  strcpy(datainfo.path_extension, "vcf");
-config->addressbook_
+database->
-
-  irmcGenericCommitChange(env, sink, ctx, &datainfo, change);
@@ -1337 +1294 @@
-  OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-  irmc_environment *env = (irmc_environment *)data;
-config *config = &(env->config
+database *database = osync_objtype_sink_get_userdata(sink
-
-  memset(&datainfo, 0, sizeof(datainfo));
@@ -1344 +1301 @@
-  strcpy(datainfo.path_identifier, "nt");
-  strcpy(datainfo.path_extension, "vnt");
-config->notebook_
+database->
-
-  irmcGenericCommitChange(env, sink, ctx, &datainfo, change);
@@ -1358 +1315 @@
-
-  irmc_environment *env = (irmc_environment *)data;
+
-  g_free(env->anchor_path);
-

plugins/irmc-sync/src/irmc_sync.h

@@ -34 +34 @@
-typedef struct  {
-  char *serial_number;
-  unsigned int calendar_changecounter;
-  char *calendar_dbid;
-  unsigned int addressbook_changecounter;
-  char *addressbook_dbid;
-  unsigned int notebook_changecounter;
-  char *notebook_dbid;
-
-  obex_t obexhandle;             // Handle to the obex connection
@@ -72 +66 @@
-typedef struct irmc_database {
-  OSyncObjFormat *objformat;     // The configured objformat for this database
+  unsigned int changecounter;   
+  char *dbid;
-} irmc_database;
-