[Opensync-commits] r5354 - plugins/ldap-sync/src

[<svn...@op...>]

Author: scriptor
Date: Thu Mar 26 22:24:45 2009
New Revision: 5354
URL: http://www.opensync.org/changeset/5354

Log:
Adjusting to the upcoming API change:

- osync_plugin_info_get_sink()
- osync_objtype_sink_get_slowsync()

will be removed.

Modified:
   plugins/ldap-sync/src/ldap_plugin.c

Modified: plugins/ldap-sync/src/ldap_plugin.c
==============================================================================
--- plugins/ldap-sync/src/ldap_plugin.c	Thu Mar 26 20:40:11 2009	(r5353)
+++ plugins/ldap-sync/src/ldap_plugin.c	Thu Mar 26 22:24:45 2009	(r5354)
@@ -2002,6 +2002,8 @@
 		goto error;
 	}
 
+	osync_trace(TRACE_INTERNAL, "%s(): *slow_sync_requested = %i", __func__, *slow_sync_requested);
+
 	if (ldaplist_added == NULL) {
 		osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldaplist_added = NULL. \n", __FILE__, __LINE__);
 		goto error;
@@ -2029,18 +2031,20 @@
 
 
 	// ----------------- slow-sync -------------------	
-	if (osync_objtype_sink_get_slowsync(sinkenv->sink)) {		
+	if (*slow_sync_requested) {		
 		osync_trace(TRACE_INTERNAL, "Slow sync requested by client");
 
 #ifdef DEBUG_ldapdata_from_server
 		ldap_plugin_printf("%s:%i: Slow sync requested for %s by client", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink));
 #endif
 
-		*slow_sync_requested = TRUE;
-
 
 		// Tell hashtable about slow-sync:
 		if (!osync_hashtable_slowsync(sinkenv->hashtable, error)) {
+			if (!osync_error_is_set(error)) {
+				osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_hashtable_slowsync() has failed.", __FILE__, __LINE__);
+			}
+	
 			goto error;
 		}
 
@@ -3359,7 +3363,7 @@
 
 	
 #ifdef DEBUG_change_type_modified
-	osync_trace(TRACE_INTERNAL, "\n\n\n\n%s:%i:%s(): xxx\n*dn_of_modified_entry = \"%s\"", __FILE__, __LINE__, __func__, *dn_of_modified_entry);
+	osync_trace(TRACE_INTERNAL, "\n\n\n\n%s:%i:%s():\n*dn_of_modified_entry = \"%s\"", __FILE__, __LINE__, __func__, *dn_of_modified_entry);
 #endif
 
 	LDAPMessage *dn_list = NULL;
@@ -4059,6 +4063,9 @@
 
 osync_bool ldap_plugin_initialize_anchor(sink_environment *sinkenv, OSyncError **error)
 {
+	char *timestamp = NULL;
+
+
 	osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, sinkenv, error);
 
 
@@ -4084,36 +4091,32 @@
 
 
 
-	// if (!osync_objtype_sink_get_slowsync(sinkenv->sink)) 
-	{
-		char *timestamp = NULL;
-
+		
 
-		OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sinkenv->sink);
-		if (anchor == NULL) {
-			osync_trace(TRACE_ERROR, "%s:%i: ERROR: anchor = NULL for objtype \"%s\". Ignoring for now.\n", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink));
-		} else {
-			timestamp = osync_anchor_retrieve(anchor, error);
+	OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sinkenv->sink);
+	if (anchor == NULL) {
+		osync_trace(TRACE_ERROR, "%s:%i: ERROR: anchor = NULL for objtype \"%s\". Ignoring for now.\n", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink));
+	} else {
+		timestamp = osync_anchor_retrieve(anchor, error);
 #ifdef DEBUG_anchor
-			ldap_plugin_printf("%s:%i: osync_anchor_retrieve() returned: \"%s\"", __FILE__, __LINE__, timestamp ? timestamp : "NULL");
+		ldap_plugin_printf("%s:%i: osync_anchor_retrieve() returned: \"%s\"", __FILE__, __LINE__, timestamp ? timestamp : "NULL");
 #endif
-		}
+	}
 
 
-		if (timestamp == NULL || timestamp[0] == 0 || strlen(timestamp) < 16) {
-			sinkenv->latest_timestamp = NULL;
-		} else {
-			sinkenv->latest_timestamp = g_strdup(timestamp);
-			g_free(timestamp);
-			timestamp = NULL;
-		}
+	if (timestamp == NULL || timestamp[0] == 0 || strlen(timestamp) < 16) {
+		sinkenv->latest_timestamp = NULL;
+	} else {
+		sinkenv->latest_timestamp = g_strdup(timestamp);
+		g_free(timestamp);
+		timestamp = NULL;
+	}
 	
 
 
 #ifdef DEBUG_anchor
-		ldap_plugin_printf("%s:%i: sinkenv->latest_timestamp for objtype \"%s\" has been initialized to \"%s\"\n", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink), sinkenv->latest_timestamp ? sinkenv->latest_timestamp : "(NULL)");
+	ldap_plugin_printf("%s:%i: sinkenv->latest_timestamp for objtype \"%s\" has been initialized to \"%s\"\n", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink), sinkenv->latest_timestamp ? sinkenv->latest_timestamp : "(NULL)");
 #endif
-	} // if (!osync_objtype_sink_get_slowsync(sinkenv->sink))
 
 
 	osync_trace(TRACE_EXIT, "%s");