More fixes

2 files changed, 21 insertions, 6 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 5a6d615..369c7a0 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -720,34 +720,33 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
     //  void setZaurusUid(int id);
    // int zaurusUid() const;
    // void setZaurusStat(int id);
    // int zaurusStat() const;
     // 0 equal
     // 1 take local
     // 2 take remote
     // 3 cancel 
     QDateTime lastSync = mLastCalendarSync;
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
-        if ( remCh )        
-            qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
+        //if ( remCh )        
+            //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( local->lastModified() > mLastCalendarSync );
-        //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
             lastSync = local->lastModified().addDays(1);
         } else {
             if ( locCh ) {
-                // qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1());
+                //qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1());
                 lastSync = local->lastModified().addDays( -1 );
                 if ( !remCh )
                     remote->setLastModified( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
                 lastSync = local->lastModified().addDays( 1 );
                 if ( remCh )
                     remote->setLastModified( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
@@ -1106,25 +1105,25 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         if ( !skipIncidence )  {
             inR = remote->incidence( uid );
             if ( ! inR ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
                             inL->removeID(mCurrentSyncDevice );
                             ++addedEventR; 
-                            qDebug("remote added Incidence %s ", inL->summary().latin1());
+                            //qDebug("remote added Incidence %s ", inL->summary().latin1());
                             inL->setLastModified( modifiedCalendar );
                             inR = inL->clone();
                             inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                             remote->addIncidence(  inR );
                         }
                     }
                 } else {
                     if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index a53b3f8..e7fc670 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -472,24 +472,27 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
         }
         ++ccc;
         if ( ccc == 2 && loopCount < 25 ) { 
             start = 0;
             bool ok;
             int newnum = templist[0].toInt( &ok );
             if ( ok && newnum > 0) {
                 retval = newnum; 
                 inc->setID( "Sharp_DTM",templist[0] );
                 inc->setCsum( "Sharp_DTM", QString::number( getCsum( templist ) ));
                 inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             }
+            if ( ok && newnum == -1 ) {
+                qDebug("Error writing back %s ", inc->summary().latin1());
+            }
         }
     }
     //qDebug("getNumFromRecord returning : %d ", retval);
     return retval;
 }
 bool SharpFormat::save( Calendar *calendar)
 {
 
     QLabel status ( i18n("Processing/adding events ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 200;
     int h = status.sizeHint().height()+20 ;
@@ -523,25 +526,38 @@ bool SharpFormat::save( Calendar *calendar)
              qApp->processEvents();
             QString eString = getEventString( ev );
             if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
                 // we write first and x  and then delete the record with the x
                 eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
                 changeString += eString + "\n";
                 deleteString += eString + "\n";
                 deleteEnt = true;
                 changeEnt = true;
                 }
             else  if ( ev->getID("Sharp_DTM").isEmpty()  ) {       // add new 
-                command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
+                QString fileNameIn = "/tmp/kopitempin";
+                QFile fileIn( fileNameIn );
+                if (!fileIn.open( IO_WriteOnly ) ) {
+                    return false;
+                } 
+                QTextStream tsIn( &fileIn );
+                tsIn.setCodec( QTextCodec::codecForName("utf8") );
+                tsIn << ePrefix << eString ;
+                fileIn.close();  
+                //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
+                command = "(cat /tmp/kopitempin | db2file datebook -w -g -c " + codec+ ") > "+ fileName;
+                qDebug("command ++++++++ ");
+                qDebug("%s ",command.latin1());
+                qDebug("command -------- ");
                 system (  command.utf8() );
                 QFile file( fileName );
                 if (!file.open( IO_ReadOnly ) ) {
                     return false;
                     
                 } 
                 QTextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, ev  ) ;