More fixes

2 files changed, 20 insertions, 5 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 5a6d615..369c7a0 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -729,10 +729,9 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
     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);
@@ -1115,7 +1114,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         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 );
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index a53b3f8..e7fc670 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -481,6 +481,9 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
                 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);
@@ -532,7 +535,20 @@ bool SharpFormat::save( Calendar *calendar)
                 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 ) ) {