messages about local changes are now logged as DEBUG and not INFO because they were confusing for users; now they are not visible in the final report

git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@282 15ad00c4-1369-45f4-8270-35d70d36bdcd

6 files changed, 106 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d7cde5c..40da462f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,90 @@
+2006-11-04  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/EvolutionSyncSource.cpp, src/TestEvolution.cpp, README, etc/localhost_1/spds/syncml/config.txt:
+	added support and testing of one-way-from-client/server
+
+2006-11-03  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/TestEvolution.cpp:
+	TaskSync tests for large object support failed because the test item didn't have the expected DESCRIPTION to stuff the item's size
+
+	* HACKING, src/TestMain.cpp:
+	allow running multiple tests by specifying them on the command line
+
+2006-11-02  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* README, etc/localhost_1/spds/sources/addressbook_1/config.txt:
+	added warning about setting evolutionuser/password when not needed -> causes backend to hang
+
+	* src/normalize_vcard.pl:
+	PHOTO/NOTE update for EGroupware and Funambol portal
+
+	* src/TestEvolution.cpp:
+	use simpler data for update test, moved complex contact update into testComplexUpdate
+
+2006-11-01  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/normalize_vcard.pl:
+	avoid that patterns accidentally run over line ends, added special cases for Funambol and EGroupware server
+
+	* test/runtests.py:
+	allow to build arbitrary combinations of client library and SyncEvolution
+
+	* src/EvolutionContactSource.cpp:
+	<<system>> and <<default>> can be used to reference the system and the default address books, respectively
+
+	* src/Makefile.am:
+	cppunit-config was not called when compiling C++ code, therefore it was only found if in the default search path
+
+	* src/TestEvolution.cpp: made test coverage configurable
+
+2006-10-29  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/TestEvolution.cpp:
+	added testLargeObjectBin, changed calendar UID so that without support for special characters in the key the sync fails
+
+	* src/EvolutionSyncClient.cpp:
+	VerDTD must be configured, otherwise Funambol 3.0a (but not 3.0b5) fails during the second sync
+
+	* etc/localhost_1/spds/sources/addressbook_1/config.txt:
+	documentation got the direction in refresh-from-client/server wrong
+
+2006-10-28  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* test/runtests.py:
+	filter out private information from logs, added --tag parameter
+
+2006-10-04  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/EvolutionSyncClient.cpp: setting config is no longer necessary
+
+	* src/TestEvolution.cpp:
+	disabled testLargeObjectEncoded again, it requires a suitable server
+
+2006-10-03  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/TestEvolution.cpp: enabled encoded LargeObject support test
+
+	* src/EvolutionCalendarSource.cpp, src/EvolutionCalendarSource.h, src/EvolutionContactSource.cpp, src/EvolutionContactSource.h, src/EvolutionSyncSource.cpp, src/EvolutionSyncSource.h:
+	adapted to new API
+
+	* src/normalize_vcard.pl: ignore some known Synthesis data conversions
+
+2006-09-28  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/TestEvolution.cpp:
+	force server to split large items when LargeObject support is enabled
+
+	* src/EvolutionCalendarSource.cpp, src/EvolutionCalendarSource.h, src/EvolutionContactSource.cpp, src/EvolutionContactSource.h, src/EvolutionSyncClient.cpp, src/EvolutionSyncClient.h, src/EvolutionSyncSource.cpp, src/EvolutionSyncSource.h, src/TestEvolution.cpp, src/syncevolution.cpp:
+	adapted to additional SyncSourceConfig parameter in SyncSource constructor, added testing of LargeObject support
+
+	* src/testVCard.vcf: make names unique again
+
+2006-09-16  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* src/EvolutionCalendarSource.h, src/EvolutionContactSource.h, src/EvolutionSyncClient.cpp, src/EvolutionSyncSource.h:
+	adapted to C++ client API change: supported datatypes now in config
+
 2006-09-11  Patrick Ohly  <Patrick.Ohly@gmx.de>
 
 	* test/runtests.py:
diff --git a/src/EvolutionCalendarSource.cpp b/src/EvolutionCalendarSource.cpp
index 2dab0b6d..84f5393e 100644
--- a/src/EvolutionCalendarSource.cpp
+++ b/src/EvolutionCalendarSource.cpp
@@ -396,17 +396,17 @@ int EvolutionCalendarSource::deleteItemThrow(SyncItem& item)
     return status;
 }
 
-void EvolutionCalendarSource::logItem(const string &uid, const string &info)
+void EvolutionCalendarSource::logItem(const string &uid, const string &info, bool debug)
 {
-    if (LOG.getLevel() >= LOG_LEVEL_INFO) {
-        LOG.info("%s: %s: %s", getName(), uid.c_str(), info.c_str());
+    if (LOG.getLevel() >= (debug ? LOG_LEVEL_DEBUG : LOG_LEVEL_INFO)) {
+        (LOG.*(debug ? &Log::debug : &Log::info))("%s: %s: %s", getName(), uid.c_str(), info.c_str());
     }
 }
 
-void EvolutionCalendarSource::logItem( SyncItem &item, const string &info )
+void EvolutionCalendarSource::logItem( SyncItem &item, const string &info, bool debug)
 {
-    if (LOG.getLevel() >= LOG_LEVEL_INFO) {
-        LOG.info("%s: %s: %s", getName(), item.getKey(), info.c_str());
+    if (LOG.getLevel() >= (debug ? LOG_LEVEL_DEBUG : LOG_LEVEL_INFO)) {
+        (LOG.*(debug ? &Log::debug : &Log::info))("%s: %s: %s", getName(), item.getKey(), info.c_str());
     }
 }
 
diff --git a/src/EvolutionCalendarSource.h b/src/EvolutionCalendarSource.h
index 274e59bf..1578b1c6 100644
--- a/src/EvolutionCalendarSource.h
+++ b/src/EvolutionCalendarSource.h
@@ -82,8 +82,8 @@ class EvolutionCalendarSource : public EvolutionSyncSource
     virtual int addItemThrow(SyncItem& item);
     virtual int updateItemThrow(SyncItem& item);
     virtual int deleteItemThrow(SyncItem& item);
-    virtual void logItem(const string &uid, const string &info);
-    virtual void logItem(SyncItem &item, const string &info);
+    virtual void logItem(const string &uid, const string &info, bool debug = false);
+    virtual void logItem(SyncItem &item, const string &info, bool debug = false);
 
   private:
     /** valid after open(): the calendar that this source references */
diff --git a/src/EvolutionContactSource.cpp b/src/EvolutionContactSource.cpp
index b402a0fb..38d4a374 100644
--- a/src/EvolutionContactSource.cpp
+++ b/src/EvolutionContactSource.cpp
@@ -666,9 +666,9 @@ const char *EvolutionContactSource::getMimeVersion()
     }
 }
 
-void EvolutionContactSource::logItem( const string &uid, const string &info )
+void EvolutionContactSource::logItem(const string &uid, const string &info, bool debug)
 {
-    if (LOG.getLevel() >= LOG_LEVEL_INFO) {
+    if (LOG.getLevel() >= (debug ? LOG_LEVEL_DEBUG : LOG_LEVEL_INFO)) {
         string line;
         EContact *contact;
         GError *gerror = NULL;
@@ -696,13 +696,13 @@ void EvolutionContactSource::logItem( const string &uid, const string &info )
         line += "): ";
         line += info;
         
-        LOG.info( "%s: %s", getName(), line.c_str() );
+        (LOG.*(debug ? &Log::debug : &Log::info))( "%s: %s", getName(), line.c_str() );
     }
 }
 
-void EvolutionContactSource::logItem( SyncItem &item, const string &info )
+void EvolutionContactSource::logItem(SyncItem &item, const string &info, bool debug)
 {
-    if (LOG.getLevel() >= LOG_LEVEL_INFO) {
+    if (LOG.getLevel() >= (debug ? LOG_LEVEL_DEBUG : LOG_LEVEL_INFO)) {
         string line;
         const char *data = (const char *)item.getData();
         int datasize = item.getDataSize();
@@ -753,7 +753,7 @@ void EvolutionContactSource::logItem( SyncItem &item, const string &info )
         line += ": ";
         line += info;
         
-        LOG.info( "%s: %s", getName(), line.c_str() );
+        (LOG.*(debug ? &Log::debug : &Log::info))( "%s: %s", getName(), line.c_str() );
     }
 }
 
diff --git a/src/EvolutionContactSource.h b/src/EvolutionContactSource.h
index d68b0e3a..15bfdc7c 100644
--- a/src/EvolutionContactSource.h
+++ b/src/EvolutionContactSource.h
@@ -93,8 +93,8 @@ class EvolutionContactSource : public EvolutionSyncSource
     virtual int addItemThrow(SyncItem& item);
     virtual int updateItemThrow(SyncItem& item);
     virtual int deleteItemThrow(SyncItem& item);
-    virtual void logItem(const string &uid, const string &info);
-    virtual void logItem(SyncItem &item, const string &info);
+    virtual void logItem(const string &uid, const string &info, bool debug = false);
+    virtual void logItem(SyncItem &item, const string &info, bool debug = false);
 
   private:
     /** valid after open(): the address book that this source references */
diff --git a/src/EvolutionSyncSource.h b/src/EvolutionSyncSource.h
index 266ab1d0..5d4d3ce3 100644
--- a/src/EvolutionSyncSource.h
+++ b/src/EvolutionSyncSource.h
@@ -274,8 +274,8 @@ class EvolutionSyncSource : public SyncSource
 
 
     /** log a one-line info about an item */
-    virtual void logItem(const string &uid, const string &info) = 0;
-    virtual void logItem(SyncItem &item, const string &info) = 0;
+    virtual void logItem(const string &uid, const string &info, bool debug = false) = 0;
+    virtual void logItem(SyncItem &item, const string &info, bool debug = false) = 0;
 
     const string m_changeId;
     const string m_id;
@@ -334,7 +334,7 @@ class EvolutionSyncSource : public SyncSource
         bool addItem(const string &uid) {
             pair<iterator, bool> res = insert(uid);
             if (res.second) {
-                m_source.logItem(uid, m_type);
+                m_source.logItem(uid, m_type, true);
             }
             return res.second;
         }