3 files changed, 80 insertions, 16 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index 598292c..ddf9790 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -121,49 +121,49 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                          if (Phone != -1) CopyUnicodeString(buffer,note->Entries[Phone].Text);
                         if (Text != -1)  {
                                 if (Phone != -1) EncodeUnicode(buffer+UnicodeLength(buffer)*2," ",1);
                                 CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text);
                         }
                         SaveVCALText(Buffer, Length, buffer, "SUMMARY");
                 } else {
                         SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
                 }
                 if (note->Type == GSM_CAL_MEETING && Location != -1) {
                         SaveVCALText(Buffer, Length, note->Entries[Location].Text, "LOCATION");
                 }
         
                 if (Time == -1) return ERR_UNKNOWN;
                 SaveVCALDateTime(Buffer, Length, &note->Entries[Time].Date, "DTSTART");
 
                 if (EndTime != -1) {
                         SaveVCALDateTime(Buffer, Length, &note->Entries[EndTime].Date, "DTEND");
                 }
 
                 if (Alarm != -1) {
                         if (note->Entries[Alarm].EntryType == CAL_SILENT_ALARM_DATETIME) {
                                 SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "DALARM");
                         } else {
-                                SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "AALARM");
+                                SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "DALARM");
                         }
                 }
 
                 /* Birthday is known to be recurranced */
                 if (Recurrance != -1 && note->Type != GSM_CAL_BIRTHDAY) {
                         switch(note->Entries[Recurrance].Number/24) {
                                         case 1   : *Length+=sprintf(Buffer+(*Length), "RRULE:D1 #0%c%c",13,10); break;
                                         case 7   : *Length+=sprintf(Buffer+(*Length), "RRULE:W1 #0%c%c",13,10); break;
                                         case 14          : *Length+=sprintf(Buffer+(*Length), "RRULE:W2 #0%c%c",13,10); break;
                                 case 365 : *Length+=sprintf(Buffer+(*Length), "RRULE:YD1 #0%c%c",13,10); break;
                         }
                 }
         } else if (Version == Siemens_VCalendar) {
                 *Length+=sprintf(Buffer+(*Length), "CATEGORIES:");
                 switch (note->Type) {
                 case GSM_CAL_MEETING:
                         *Length+=sprintf(Buffer+(*Length), "Meeting%c%c",13,10);
                         break;
                 case GSM_CAL_CALL:
                         *Length+=sprintf(Buffer+(*Length), "Phone Call%c%c",13,10);
                         break;
                 case GSM_CAL_BIRTHDAY:
                         *Length+=sprintf(Buffer+(*Length), "Anniversary%c%c",13,10);
                         break;
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index 5163d81..a3b93a8 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -8220,176 +8220,203 @@ int main(int argc, char *argv[])
                 s.opened = false;
                 s.msg    = NULL;
                 s.ConfigNum = 0;
 
         setlocale(LC_ALL, "");
 #ifdef DEBUG
                 di.dl   = DL_TEXTALL;
                 di.df    = stdout;
 #endif
     //#if 0
          /* Any parameters? */
         if (argc == 1) {
                 HelpGeneral();
                 printmsg("Too few parameters!\n");
                 exit(1);
         }
 
          /* Help? */
         if (strncmp(argv[1 + start], "--help", 6) == 0) {
                 Help(argc - start, argv + start);
                 exit(1);
         }
 
                 /* Is first parameter numeric? If so treat it as config that should be loaded. */
-        if (isdigit(argv[1][0])) {
-                only_config = atoi(argv[1]);
-                if (only_config >= 0) start++; else only_config = -1;
-        }
-
+        //if (isdigit(argv[1][0])) {
+    //only_config = atoi(argv[1]);
+    //if (only_config >= 0) start++; else only_config = -1;
+        //}
+    only_config = 0;;
+#if 0
     GSM_ReadConfig(NULL, &s.Config[0], 0);
                 s.ConfigNum = 1;
     GSM_Config *con = &s.Config[0];
 
     char* tempC;
     tempC = argv[argc-1]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using model %s \n",tempC);
                 strcpy(con->Model,tempC );
      }
     tempC = argv[argc-2]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using device %s \n",tempC);
         con->Device = strdup(tempC);
                 con->DefaultDevice = false;
      }
     tempC = argv[argc-3]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using connection %s \n",tempC);
         con->Connection = strdup(tempC);
                 con->DefaultConnection = false;
      }
     argc = argc-3;
-#if 0
+    //#if 0
     if ( ! mConnection.isEmpty() ) {
         cfg->Connection = strdup(mConnection.latin1());
                 cfg->DefaultConnection = false;
         qDebug("Connection set %s ", cfg->Connection );
 
     }
     if ( ! mDevice.isEmpty() ) {
         cfg->Device = strdup(mDevice.latin1());
                 cfg->DefaultDevice = false;
         qDebug("Device  set %s ", cfg->Device);
 
     }
     if ( ! mModel.isEmpty() ) {
                 strcpy(cfg->Model,mModel.latin1() );
                 cfg->DefaultModel = false;
         qDebug("Model  set %s ",cfg->Model );
     }
 
 #endif
 
-#if 0
+
         cfg=GSM_FindGammuRC();
         for (i = 0; i <= MAX_CONFIG_NUM; i++) {
                 if (cfg!=NULL) {
                         cp = INI_GetValue(cfg, "gammu", "gammucoding", false);
                         if (cp) di.coding = cp;
 
                         s.Config[i].Localize = INI_GetValue(cfg, "gammu", "gammuloc", false);
                         if (s.Config[i].Localize) {
                                 s.msg=INI_ReadFile(s.Config[i].Localize, true);
                         } else {
 #if !defined(WIN32) && defined(LOCALE_PATH)
                                 locale = setlocale(LC_MESSAGES, NULL);
                                 if (locale != NULL) {
                                         snprintf(locale_file, 200, "%s/gammu_%c%c.txt",
                                                         LOCALE_PATH,
                                                         tolower(locale[0]),
                                                         tolower(locale[1]));
                                         s.msg = INI_ReadFile(locale_file, true);
                                 }
 #endif
                         }
                 }
 
                 /* Wanted user specific configuration? */
+
                 if (only_config != -1) {
                         /* Here we get only in first for loop */
                         if (!GSM_ReadConfig(cfg, &s.Config[0], only_config)) break;
                 } else {
                         if (!GSM_ReadConfig(cfg, &s.Config[i], i) && i != 0) break;
                 }
                 s.ConfigNum++;
 
                 /* We want to use only one file descriptor for global and state machine debug output */
                     s.Config[i].UseGlobalDebugFile = true;
                 
                 /* It makes no sense to open several debug logs... */
                 if (i != 0) {
                         strcpy(s.Config[i].DebugLevel, s.Config[0].DebugLevel);
                         free(s.Config[i].DebugFile);
                         s.Config[i].DebugFile = strdup(s.Config[0].DebugFile);
                 } else {
                         /* Just for first config */
                         /* When user gave debug level on command line */
                         if (argc > 1 + start && GSM_SetDebugLevel(argv[1 + start], &di)) {
                                 /* Debug level from command line will be used with phone too */
                                 strcpy(s.Config[i].DebugLevel,argv[1 + start]);
                                 start++;
                         } else {
                                 /* Try to set debug level from config file */
                                 GSM_SetDebugLevel(s.Config[i].DebugLevel, &di);
                         }
                         /* If user gave debug file in gammurc, we will use it */
                         error=GSM_SetDebugFile(s.Config[i].DebugFile, &di);
                         Print_Error(error);
                 }
 
                 /* We wanted to read just user specified configuration. */
                 if (only_config != -1) {break;}
          }
+#if 0
+ GSM_Config *con = &s.Config[0];
+
+    char* tempC;
+    tempC = argv[argc-1]+2;
+    if ( *tempC != 0 ) {
+        fprintf(stderr,"Using model %s \n",tempC);
+                strcpy(con->Model,tempC );
+     }
+    tempC = argv[argc-2]+2;
+    if ( *tempC != 0 ) {
+        fprintf(stderr,"Using device %s \n",tempC);
+        con->Device = strdup(tempC);
+                con->DefaultDevice = false;
+     }
+    tempC = argv[argc-3]+2;
+    if ( *tempC != 0 ) {
+        fprintf(stderr,"Using connection %s \n",tempC);
+        con->Connection = strdup(tempC);
+                con->DefaultConnection = false;
+     }
 #endif
+    argc = argc-3;
+
+
         /* Do we have enough parameters? */
          if (argc == 1 + start) {
                 HelpGeneral();
                 printmsg("Too few parameters!\n");
                 exit(-2);
         }
 
         /* Check used version vs. compiled */
         if (!mystrncasecmp(GetGammuVersion(),VERSION,0)) {
                 printmsg("ERROR: version of installed libGammu.so (%s) is different to version of Gammu (%s)\n",
                                         GetGammuVersion(),VERSION);
                 exit(-1);
         }
 
         /* Check parameters */
         while (Parameters[z].Function != NULL) {
                 if (mystrncasecmp(Parameters[z].parameter,argv[1+start], 0)) {
                         if (argc-2-start >= Parameters[z].min_arg && argc-2-start <= Parameters[z].max_arg) {
+                fprintf(stderr,"Executing  \n");        
                                 Parameters[z].Function(argc - start, argv + start);
                                 break;
                         } else {
                                 count_failed = true;
                         }
                 }
                 z++;
         }
 
         /* Tell user when we did nothing */
         if (Parameters[z].Function == NULL) {
                 HelpGeneral();
                 if (count_failed) {
                         printmsg("Bad parameter count!\n");
                 } else {
                         printmsg("Bad option!\n");
                 }
          }
 
              /* Close debug output if opened */
              if (di.df!=stdout) fclose(di.df);
         //#endif // 0
         fprintf(stderr,"kammu: Success. End.  \n");        
         exit(0);
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 2ad1b5a..6df639f 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -14,48 +14,49 @@
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qxml.h>
 #include <qlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
+#include <kmessagebox.h>
 
 #include "calendar.h"
 #include "alarm.h"
 #include "recurrence.h"
 #include "calendarlocal.h"
 
 #include "phoneformat.h"
 #include "syncdefines.h"
 
 using namespace KCal;
 class PhoneParser : public QObject
 {
 public:
     PhoneParser(   )  {
         ;
     }
    
     static QString dtToString( const QDateTime& dti, bool useTZ = false )
     {
         QString datestr;
         QString timestr;
         int offset =  KGlobal::locale()->localTimeOffset( dti );
         QDateTime   dt;
         if (useTZ)
@@ -225,117 +226,133 @@ ulong PhoneFormat::getCsumEvent( Event* event )
             break;
        
         default:
             list.append( "255" );
             list.append( QString() );
             list.append( "0" );
             list.append( QString() );
             list.append( "0" );
             list.append( "20991231T000000" );
             break;
         }
     if  ( writeEndDate ) {
         
         if ( rec->endDate().isValid() ) { // 15 + 16
             list.append( "1" );
             list.append( PhoneParser::dtToString( rec->endDate()) );
         } else {
             list.append( "0" );
             list.append( "20991231T000000" );
         }
         
     }
     attList << list.join("");
     attList << event->categoriesStr();
+    //qDebug("csum cat %s", event->categoriesStr().latin1()); 
+
     attList << event->secrecyStr();
     return PhoneFormat::getCsum(attList );  
 }
 ulong PhoneFormat::getCsum( const QStringList &  attList)
 {
     int max = attList.count() -1;
     ulong cSum = 0;
     int j,k,i;
     int add;
     for ( i = 1; i < max ; ++i ) {
         QString s = attList[i];
         if ( ! s.isEmpty() ){
             j = s.length();
             for ( k = 0; k < j; ++k ) {
                 int mul = k +1;
                 add = s[k].unicode ();
                 if ( k < 16 )
                     mul = mul * mul;
                 add = add * mul *i*i*i;
                 cSum += add;
             }
         }
     }
+    //QString dump = attList.join(",");
+    //qDebug("csum: %s", dump.latin1()); 
+    
     return cSum;
 
 }
 //extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum);
 #include <stdlib.h>
 #define DEBUGMODE false
 bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
 {
 
     QString fileName;
 #ifdef _WIN32_
     fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs";
 #else
     fileName = "/tmp/kdepimtemp.vcs";
 #endif
     QString command ="./kammu --backup " + fileName + " -yes -C" + 
         mConnection +" -D" + mDevice +" -M" + mModel;
     int ret = system (  command.latin1() );
-    if ( ret !=  0 )
+    if ( ret != 0 ) {
+        qDebug("Error::command returned %d", ret); 
         return false;
+    }
+    qDebug("Command returned %d", ret); 
     VCalFormat vfload;
     vfload.setLocalTime ( true ); 
+    qDebug("loading file ..."); 
+
     if ( ! vfload.load( calendar, fileName ) )
         return false;
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
+    qDebug("reading events... "); 
     while ( ev ) {
+        QStringList cat = ev->categories();
+        if ( cat.contains( "MeetingDEF" )) {
+            ev->setCategories( QStringList() );
+        }
         int id = ev->pilotId();
         Event *event;
         event = existingCal->event( mProfileName ,QString::number( id ) );
         if ( event ) {
             event = (Event*)event->clone();
             copyEvent( event,  ev );
             calendar->deleteEvent( ev );
             calendar->addEvent( event);
         }
         else
             event = ev;
         uint cSum;
         cSum = PhoneFormat::getCsumEvent( event );
         event->setCsum( mProfileName, QString::number( cSum ));
         event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
         event->setID( mProfileName,QString::number( id ) );
         ev =  er.next();
     }
     {
+        qDebug("reading todos... "); 
         QPtrList<Todo> tr = calendar->rawTodos();
         Todo* ev = tr.first();  
         while ( ev ) {
 
             QStringList cat = ev->categories();
             if ( cat.contains( "MeetingDEF" )) {
                 ev->setCategories( QStringList() );
             }
             int id = ev->pilotId();
             Todo *event;
             event = existingCal->todo( mProfileName ,QString::number( id ) );
             if ( event ) {
                 event = (Todo*)event->clone();
                 copyTodo( event,  ev );
                 calendar->deleteTodo( ev );
                 calendar->addTodo( event);
             }
             else
                 event = ev;
             uint cSum;
             cSum = PhoneFormat::getCsumTodo( event );
             event->setCsum( mProfileName, QString::number( cSum ));
             event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
             event->setID( mProfileName,QString::number( id ) );
@@ -461,114 +478,134 @@ bool PhoneFormat::save( Calendar *calendar)
     QString  fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs";
 #else
     QString  fileName = "/tmp/kdepimtemp.vcs";
 #endif
 
     // 1 remove events which should be deleted
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
         if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { 
             calendar->deleteEvent( ev );
         } else {
 
         }
         ev =  er.next();
     }
     //  2 remove todos which should be deleted
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     while ( to ) {
         if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
             calendar->deleteTodo( to );   
         } 
         to = tl.next();
-    }
+    } 
     //  3 save file 
     VCalFormat vfsave;
     vfsave.setLocalTime ( true ); 
     if ( ! vfsave.save( calendar, fileName ) )
         return false;
     // 4 call kammu
     QString command ="./kammu --restore " + fileName + "  -C" + 
-        mConnection +" -D" + mDevice +" -M" + mModel;;
-    int ret = system (  command.latin1() );
-    if ( ret !=  0 )
+        mConnection +" -D" + mDevice +" -M" + mModel;
+    int ret;
+    while ( (ret = system (  command.latin1())) != 0 ) {
+        qDebug("Error S::command returned %d. asking users", ret); 
+        int retval = KMessageBox::warningContinueCancel(0,
+                                                        i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel"));
+        if ( retval != KMessageBox::Continue )
+            return false;
+    }
+    if ( ret !=  0 ) {
+        qDebug("Error S::command returned %d", ret); 
         return false;
+    }
     // 5 reread data
     message = i18n(" Rereading all data ... ");
     status.setText ( message  );
     qApp->processEvents();
     CalendarLocal* calendarTemp = new CalendarLocal(); 
     calendarTemp->setTimeZoneId( calendar->timeZoneId());
     if ( ! load( calendarTemp,calendar) ){
         qDebug("error reloading calendar ");
         delete calendarTemp;
         return false;
     }
     // 6 compare data
 
 //algo 6 compare event
     er = calendar->rawEvents();
     ev = er.first(); 
     message = i18n(" Comparing event # ");
     QPtrList<Event> er1 = calendarTemp->rawEvents();
     Event* ev1; 
     int procCount = 0;
     while ( ev ) {
-            qDebug("event new ID "); 
+        //qDebug("event new ID %s",ev->summary().latin1()); 
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
-            QString cSum = ev->getCsum(mProfileName);
+            uint csum;
+            csum = PhoneFormat::getCsumEvent( ev );
+            QString cSum = QString::number( csum );
+            ev->setCsum( mProfileName,  cSum );
+            //qDebug("Event cSum %s ", cSum.latin1());
             ev1 = er1.first(); 
             while ( ev1 ) {
                 if (  ev1->getCsum( mProfileName ) == cSum ) {
                     er1.remove( ev1 );
                     afterSave( ev );
                     ev->setID(mProfileName, ev1->getID(mProfileName) );
+                    //qDebug("Event found  on phone for %s ", ev->summary().latin1());
+
                     break;
                 }
                 ev1 =  er1.next();
             } 
             if ( ! ev1 ) {
                 ev->removeID(mProfileName);
                 qDebug("ERROR: No event found  on phone for %s ", ev->summary().latin1());
             }
             
         
         ev =  er.next();
     }
     //algo 6 compare todo
+    tl = calendar->rawTodos(); 
     to = tl.first();
     procCount = 0;
     QPtrList<Todo> tl1 = calendarTemp->rawTodos(); 
     Todo* to1 ;
     message = i18n(" Comparing todo # ");
     while ( to  ) {
         qDebug("todo2 %d ", procCount);
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
-            QString cSum = to->getCsum(mProfileName);
+            uint csum;
+            csum = PhoneFormat::getCsumTodo( to );
+            QString cSum = QString::number( csum );
+            to->setCsum( mProfileName,  cSum );
+            qDebug("Todo cSum %s ", cSum.latin1());
             Todo* to1 = tl1.first(); 
             while ( to1 ) {
                 if (  to1->getCsum( mProfileName ) == cSum ) {
                     tl1.remove( to1 );
                     afterSave( to );
                     to->setID(mProfileName, to1->getID(mProfileName) );
                     break;
                 }
                 to1 =  tl1.next();
             }
             if ( ! to1 ) {
                 to->removeID(mProfileName);
                 qDebug("ERROR: No todo found on phone for %s ", to->summary().latin1());
             }
         
         to = tl.next();
     }
     delete calendarTemp;
     return true;
 
 
 
 }