Menu
▾
▴
[Opensync-commits] r5491 - in plugins/ldap-sync: . src
|
From: <svn...@op...> - 2009-03-31 14:56:41
|
Author: bellmich Date: Tue Mar 31 16:56:29 2009 New Revision: 5491 URL: http://www.opensync.org/changeset/5491 Log: - migrated OSyncAnchor to OSyncSinkStateDB - fixed config.h and Doxyfile generation Modified: plugins/ldap-sync/CMakeLists.txt plugins/ldap-sync/src/ldap_plugin.c plugins/ldap-sync/src/ldap_plugin.h Modified: plugins/ldap-sync/CMakeLists.txt ============================================================================== --- plugins/ldap-sync/CMakeLists.txt Tue Mar 31 16:41:53 2009 (r5490) +++ plugins/ldap-sync/CMakeLists.txt Tue Mar 31 16:56:29 2009 (r5491) @@ -69,7 +69,7 @@ IF ( DOXYGEN_DOT_EXECUTABLE ) SET( HAVE_DOT "YES" ) ENDIF ( DOXYGEN_DOT_EXECUTABLE ) - CONFIGURE_FILE( "Doxyfile.in" "Doxyfile" ) + CONFIGURE_FILE( "Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" ) ADD_CUSTOM_TARGET( doxygen ${DOXYGEN_EXECUTABLE} ) ENDIF ( DOXYGEN_EXECUTABLE ) @@ -114,7 +114,7 @@ ################### config.h ############################# SET( SHARE_INSTALL_DIR "${SHARE_INSTALL_DIR}" CACHE PATH "Installation directory for configuration files and schemata") -CONFIGURE_FILE( "config.h.cmake" "config.h" ) +CONFIGURE_FILE( "config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h" ) Modified: plugins/ldap-sync/src/ldap_plugin.c ============================================================================== --- plugins/ldap-sync/src/ldap_plugin.c Tue Mar 31 16:41:53 2009 (r5490) +++ plugins/ldap-sync/src/ldap_plugin.c Tue Mar 31 16:56:29 2009 (r5491) @@ -382,7 +382,7 @@ * anything about the comparison. */ -osync_bool ldap_plugin_check_anchor_system(OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error) +osync_bool ldap_plugin_check_state_system(OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error) { char *timestamp = NULL; @@ -407,20 +407,20 @@ // Get the latest stored anchor from the device char *path_field = g_strdup_printf("path_%s", osync_objtype_sink_get_name(sinkenv->sink)); - osync_bool anchor_match; - 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)); + osync_bool state_match; + OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(sinkenv->sink); + if (state_db == NULL) { + osync_trace(TRACE_ERROR, "%s:%i: ERROR: state_db = NULL for objtype \"%s\". Ignoring for now.\n", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink)); goto out; } - timestamp = osync_anchor_retrieve(anchor, "latest_timestamp", error); + timestamp = osync_sink_state_get(state_db, "latest_timestamp", error); if (timestamp) { osync_trace(TRACE_INTERNAL, "Latest timestamp in anchordb is: %s (objtype: \"%s\")\n", timestamp, osync_objtype_sink_get_name(sinkenv->sink)); #ifdef DEBUG_anchor - ldap_plugin_printf("%s:%i: Latest timestamp for objtype \"%s\" in anchordb is: \"%s\"", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink), timestamp); + ldap_plugin_printf("%s:%i: Latest timestamp for objtype \"%s\" in state_db is: \"%s\"", __FILE__, __LINE__, osync_objtype_sink_get_name(sinkenv->sink), timestamp); #endif } else { @@ -433,21 +433,21 @@ if (sinkenv->latest_timestamp && sinkenv->latest_timestamp[0]) { - if (!osync_anchor_compare(anchor, "latest_timestamp", sinkenv->latest_timestamp, &anchor_match, error)) { + if (!osync_sink_state_equal(state_db, "latest_timestamp", sinkenv->latest_timestamp, &state_match, error)) { if (!osync_error_is_set(error)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_anchor_compare() has failed.", __FILE__, __LINE__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_sink_state_equal() has failed.", __FILE__, __LINE__); } goto error; } } else { #ifdef DEBUG_anchor - ldap_plugin_printf("%s:%i: sinkenv->latest_timestamp was NULL. Therefore setting anchor_match to FALSE.", __FILE__, __LINE__); + ldap_plugin_printf("%s:%i: sinkenv->latest_timestamp was NULL. Therefore setting state_match to FALSE.", __FILE__, __LINE__); #endif - anchor_match = FALSE; + state_match = FALSE; } - if (!anchor_match) { + if (!state_match) { #ifdef DEBUG_anchor ldap_plugin_printf("%s:%i: Anchor value differs from our own one, therefore setting \"slow-sync\":", __FILE__, __LINE__); #endif @@ -4015,16 +4015,16 @@ osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: tt = NULL.\n", __FILE__, __LINE__); } - // Store it in anchordb. - OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); - if (anchor == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: anchor = NULL.\n", __FILE__, __LINE__); + // Store it in state database. + OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(sink); + if (state_db == NULL) { + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: state_db = NULL.\n", __FILE__, __LINE__); goto error; } - if (!osync_anchor_update(anchor, "latest_timestamp", sinkenv->latest_timestamp, &error)) { + if (!osync_sink_state_set(state_db, "latest_timestamp", sinkenv->latest_timestamp, &error)) { if (!osync_error_is_set(&error)) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_anchor_update() has failed.\n", __FILE__, __LINE__); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_sink_state_set() has failed.\n", __FILE__, __LINE__); } goto error; @@ -4110,13 +4110,13 @@ - OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sinkenv->sink); - if (anchor == NULL) { + OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(sinkenv->sink); + if (state_db == 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, "latest_timestamp", error); + timestamp = osync_sink_state_get(state_db, "latest_timestamp", 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_sink_state_get() returned: \"%s\"", __FILE__, __LINE__, timestamp ? timestamp : "NULL"); #endif } @@ -4425,8 +4425,8 @@ osync_objtype_sink_enable_hashtable(sinkenv->sink, TRUE); // Initialize anchor system - osync_objtype_sink_enable_anchor(sinkenv->sink, TRUE); - osync_trace(TRACE_INTERNAL, "%s:%i: Having called \"osync_objtype_sink_enable_anchor(sinkenv->sink, TRUE);\"; sinkenv = %p, sinkenv->sink = %p", __FILE__, __LINE__, sinkenv, sinkenv->sink); + osync_objtype_sink_enable_state_db(sinkenv->sink, TRUE); + osync_trace(TRACE_INTERNAL, "%s:%i: Having called \"osync_objtype_sink_enable_state_db(sinkenv->sink, TRUE);\"; sinkenv = %p, sinkenv->sink = %p", __FILE__, __LINE__, sinkenv, sinkenv->sink); Modified: plugins/ldap-sync/src/ldap_plugin.h ============================================================================== --- plugins/ldap-sync/src/ldap_plugin.h Tue Mar 31 16:41:53 2009 (r5490) +++ plugins/ldap-sync/src/ldap_plugin.h Tue Mar 31 16:56:29 2009 (r5491) @@ -308,8 +308,8 @@ osync_bool anonymous; ///< Bind as anonymous user osync_bool ldap_read, ldap_write; ///< Read/Write permissions int ldap_version; ///< LDAP version (2 or 3) - // char *anchor_path; ///< For the anchor system. - // OSyncAnchor *anchor; ///< For the anchor system + // char *state_name; ///< For the state database + // OSyncSinkStateDB *state_db; ///< For the state database char *latest_timestamp; ///< For the anchor system. osync_bool evolution_support; ///< Whether or not the LDAP server supports ///< the "evolutionPerson" objectclass. |
