Many bugfixes

1 files changed, 4 insertions, 3 deletions

diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index defdb09..89eb72f 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -135,98 +135,99 @@ class SharpParser : public QObject
                 // qDebug("next ");
                 QString posStr = attList[13];
                 int pos = posStr.toInt();
                 Recurrence *r = event->recurrence();
 
                 if ( rtype == "0" ) {
                     if ( hasEndDate ) r->setDaily( freq, endDate );
                     else r->setDaily( freq, -1 );
                 } else if ( rtype == "1" ) {
                     if ( hasEndDate ) r->setWeekly( freq, weekDays, endDate );
                     else r->setWeekly( freq, weekDays, -1 );
                 } else if ( rtype == "3" ) {
                     if ( hasEndDate )
                         r->setMonthly( Recurrence::rMonthlyDay, freq, endDate );
                     else
                         r->setMonthly( Recurrence::rMonthlyDay, freq, -1 );
                     r->addMonthlyDay( startDate.day() );
                 } else if ( rtype == "2" ) {
                     if ( hasEndDate )
                         r->setMonthly( Recurrence::rMonthlyPos, freq, endDate );
                     else
                         r->setMonthly( Recurrence::rMonthlyPos, freq, -1 );
                     QBitArray days( 7 );
                     days.fill( false );
                     days.setBit( startDate.dayOfWeek() - 1 );
                     r->addMonthlyPos( pos, days );
                 } else if ( rtype == "4" ) {
                     if ( hasEndDate )
                         r->setYearly( Recurrence::rYearlyMonth, freq, endDate );
                     else
                         r->setYearly( Recurrence::rYearlyMonth, freq, -1 );
                     r->addYearlyNum( startDate.month() );
                 }
             } else {
                 event->recurrence()->unsetRecurs();
             }
         
             QString categoryList = attList[1] ;
             event->setCategories( lookupCategories( categoryList ) );
 
             // strange 0 semms to mean: alarm enabled
             if ( attList[8] == "0" ) {
                 Alarm *alarm;
                 if (  event->alarms().count() > 0 )
                     alarm = event->alarms().first();
                 else {
                     alarm = new Alarm( event );
                     event->addAlarm( alarm );
+                    alarm->setType( Alarm::Audio );
                 }
-                alarm->setType( Alarm::Audio );
+                //alarm->setType( Alarm::Audio );
                 alarm->setEnabled( true );
                 int alarmOffset = attList[9].toInt();
                 alarm->setStartOffset( alarmOffset * -60 );
             } else {
                 Alarm *alarm;
                 if (  event->alarms().count() > 0 ) {
                     alarm = event->alarms().first();
                     alarm->setType( Alarm::Audio );
                     alarm->setStartOffset( -60*15 );
                     alarm->setEnabled( false );
                 }
             }
         
             mCalendar->addEvent( event);
         } else if ( qName == "Todo" ) {
             Todo *todo;
 
             todo = existingCalendar->todo( "Sharp_DTM", attList[0] );
             if (todo )
                 todo = (Todo*)todo->clone();
             else
                 todo = new Todo;
 
 //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1
 //  0      1       2    3    4    5    6    7    8
 //1,,,,,1,4,Loch zumachen,""
 //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb ""   "
 //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes
      
             todo->setID( "Sharp_DTM", attList[0]);
             todo->setCsum( "Sharp_DTM", QString::number( cSum ));
             todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
       
             todo->setSummary( attList[7] );
             todo->setDescription( attList[8]);
         
             int priority = attList[6].toInt();
             if ( priority == 0 ) priority = 3;
             todo->setPriority( priority );
         
             QString categoryList = attList[1];
             todo->setCategories( lookupCategories( categoryList ) );
         
        
         
             QString hasDateStr = attList[3]; // due
             if ( !hasDateStr.isEmpty() ) {
                 if ( hasDateStr.right(6) == "000000" ) {
@@ -323,103 +324,103 @@ class SharpParser : public QObject
     {
       QMap<QString,QString>::ConstIterator it = mCategoriesMap.find( id );
       if ( it == mCategoriesMap.end() ) return id;
       else return *it;
     }
 
     static void setCategory( const QString &id, const QString &name )
     {
       mCategoriesMap.insert( id, name );
     }
 
     static QMap<QString,QString> mCategoriesMap;
 };
 
 QMap<QString,QString> SharpParser::mCategoriesMap;
 
 SharpFormat::SharpFormat()
 {
     mCategories = 0;
 }
 
 SharpFormat::~SharpFormat()
 {
 }
 ulong SharpFormat::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;
             }
         }
     }
     return cSum;
 
 }
 #include <stdlib.h>
-#define DEBUGMODE false
+//#define DEBUGMODE false
+#define DEBUGMODE true
 bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
 {
 
    
     bool debug = DEBUGMODE;
-    //debug = true;
     QString text;
     QString codec = "utf8";
     QLabel status ( i18n("Reading events ..."), 0 );
     
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 200;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     status.setCaption(i18n("Reading DTM Data") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     QString  fileName; 
     if ( ! debug ) {
         fileName = "/tmp/kopitempout";
         QString command ="db2file datebook -r -c "+ codec + " > " + fileName;
         system (  command.latin1() );
     } else {
         fileName = "/tmp/events.txt";
         
     }  
     QFile file( fileName );
     if (!file.open( IO_ReadOnly ) ) {
         return false;
         
     } 
     QTextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
     text = ts.read();
     file.close();  
     status.setText(  i18n("Processing events ...") );
     status.raise();
     qApp->processEvents();
     fromString2Cal( calendar, existngCal, text, "Event" ); 
     status.setText(  i18n("Reading todos ...") );
     qApp->processEvents();
     if ( ! debug ) {
         fileName = "/tmp/kopitempout";
         QString command = "db2file todo -r -c " + codec+ " > " + fileName;
         system (  command.latin1() );
     } else {
         fileName = "/tmp/todo.txt";
     } 
     file.setName( fileName );
     if (!file.open( IO_ReadOnly ) ) {
         return false;