many phone sync fixes

1 files changed, 26 insertions, 10 deletions

diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 6df639f..ef69bce 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -130,5 +130,8 @@ ulong PhoneFormat::getCsumTodo( Todo* todo )
         completedString = "yes";
     attList << completedString; 
-    attList << QString::number( todo->priority() ); 
+    int prio = todo->priority();
+    if( prio == 2 ) prio = 1;
+    if (prio == 4 ) prio = 5 ;
+    attList << QString::number( prio ); 
     QString alarmString = "na";
     Alarm *alarm;
@@ -255,9 +258,9 @@ ulong PhoneFormat::getCsumEvent( Event* event )
 ulong PhoneFormat::getCsum( const QStringList &  attList)
 {
-    int max = attList.count() -1;
+    int max = attList.count();
     ulong cSum = 0;
     int j,k,i;
     int add;
-    for ( i = 1; i < max ; ++i ) {
+    for ( i = 0; i < max ; ++i ) {
         QString s = attList[i];
         if ( ! s.isEmpty() ){
@@ -268,11 +271,15 @@ ulong PhoneFormat::getCsum( const QStringList &  attList)
                 if ( k < 16 )
                     mul = mul * mul;
-                add = add * mul *i*i*i;
+                int ii = i+1;
+                add = add * mul *ii*ii*ii;
                 cSum += add;
             }
         }
+        if ( i == 0 )
+            qDebug("csum: i == 0 %d ", cSum); 
+            
     }
-    //QString dump = attList.join(",");
-    //qDebug("csum: %s", dump.latin1()); 
+    QString dump = attList.join(",");
+    qDebug("csum: %d %s", cSum,dump.latin1()); 
     
     return cSum;
@@ -291,6 +298,5 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
     fileName = "/tmp/kdepimtemp.vcs";
 #endif
-    QString command ="./kammu --backup " + fileName + " -yes -C" + 
-        mConnection +" -D" + mDevice +" -M" + mModel;
+    QString command ="./kammu --backup " + fileName + " -yes" ;
     int ret = system (  command.latin1() );
     if ( ret != 0 ) {
@@ -345,4 +351,6 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
             event = existingCal->todo( mProfileName ,QString::number( id ) );
             if ( event ) {
+                qDebug("copy todo %s ", event->summary().latin1()); 
+
                 event = (Todo*)event->clone();
                 copyTodo( event,  ev );
@@ -376,4 +384,5 @@ void PhoneFormat::copyEvent( Event* to,  Event* from )
 
     QPtrListIterator<Alarm> it( from->alarms() );
+    if ( it.current() )
     to->clearAlarms();
     const Alarm *a;
@@ -415,4 +424,5 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 
     QPtrListIterator<Alarm> it( from->alarms() );
+    if ( it.current() )
     to->clearAlarms();
     const Alarm *a;
@@ -444,4 +454,9 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
             to->setPercentComplete(from->percentComplete()); 
     }
+    if( to->priority() == 2 && from->priority() == 1 )
+        ; //skip
+    else if (to->priority() == 4 && from->priority() == 5 )
+        ;
+    else
     to->setPriority(from->priority());
 
@@ -453,4 +468,5 @@ void PhoneFormat::afterSave( Incidence* inc)
     uint csum;
     inc->removeID( mProfileName );
+#if 0
     if ( inc->type() == "Event")
         csum = PhoneFormat::getCsumEvent( (Event*) inc );
@@ -458,4 +474,5 @@ void PhoneFormat::afterSave( Incidence* inc)
         csum = PhoneFormat::getCsumTodo( (Todo*) inc );
     inc->setCsum( mProfileName, QString::number( csum ));
+#endif
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
 
@@ -507,6 +524,5 @@ bool PhoneFormat::save( Calendar *calendar)
         return false;
     // 4 call kammu
-    QString command ="./kammu --restore " + fileName + "  -C" + 
-        mConnection +" -D" + mDevice +" -M" + mModel;
+    QString command ="./kammu --restore " + fileName ;
     int ret;
     while ( (ret = system (  command.latin1())) != 0 ) {