summaryrefslogtreecommitdiff
path: root/libopie/pim
Unidiff
Diffstat (limited to 'libopie/pim') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/odatebookaccessbackend_xml.cpp7
-rw-r--r--libopie/pim/opimmainwindow.h2
-rw-r--r--libopie/pim/test/oevent_test.cpp4
3 files changed, 10 insertions, 3 deletions
diff --git a/libopie/pim/odatebookaccessbackend_xml.cpp b/libopie/pim/odatebookaccessbackend_xml.cpp
index 24b69fe..4a6b7b8 100644
--- a/libopie/pim/odatebookaccessbackend_xml.cpp
+++ b/libopie/pim/odatebookaccessbackend_xml.cpp
@@ -81,12 +81,13 @@ namespace {
81 FTimeZone, 81 FTimeZone,
82 FRecParent, 82 FRecParent,
83 FRecChildren, 83 FRecChildren,
84 FExceptions 84 FExceptions
85 }; 85 };
86 inline void save( const OEvent& ev, QString& buf ) { 86 inline void save( const OEvent& ev, QString& buf ) {
87 qWarning("Saving %d %s", ev.uid(), ev.description().latin1() );
87 buf += " description=\"" + Qtopia::escapeString(ev.description() ) + "\""; 88 buf += " description=\"" + Qtopia::escapeString(ev.description() ) + "\"";
88 if (!ev.location().isEmpty() ) 89 if (!ev.location().isEmpty() )
89 buf += " location=\"" + Qtopia::escapeString(ev.location() ) + "\""; 90 buf += " location=\"" + Qtopia::escapeString(ev.location() ) + "\"";
90 91
91 buf += " categories=\""+ Qtopia::escapeString( Qtopia::Record::idsToString( ev.categories() ) ) + "\""; 92 buf += " categories=\""+ Qtopia::escapeString( Qtopia::Record::idsToString( ev.categories() ) ) + "\"";
92 buf += " uid=\"" + QString::number( ev.uid() ) + "\""; 93 buf += " uid=\"" + QString::number( ev.uid() ) + "\"";
@@ -122,12 +123,13 @@ namespace {
122 123
123 buf += " timezone=\""; 124 buf += " timezone=\"";
124 if ( ev.timeZone().isEmpty() ) 125 if ( ev.timeZone().isEmpty() )
125 buf += "None"; 126 buf += "None";
126 else 127 else
127 buf += ev.timeZone(); 128 buf += ev.timeZone();
129 buf += "\"";
128 130
129 if (ev.parent() != 0 ) { 131 if (ev.parent() != 0 ) {
130 buf += " recparent=\""+QString::number(ev.parent() )+"\""; 132 buf += " recparent=\""+QString::number(ev.parent() )+"\"";
131 } 133 }
132 134
133 if (ev.children().count() != 0 ) { 135 if (ev.children().count() != 0 ) {
@@ -431,13 +433,12 @@ bool ODateBookAccessBackend_XML::loadFile() {
431 else { 433 else {
432 setField( ev, *find, value ); 434 setField( ev, *find, value );
433 } 435 }
434 } 436 }
435 /* time to finalize */ 437 /* time to finalize */
436 finalizeRecord( ev ); 438 finalizeRecord( ev );
437 add( ev );
438 delete rec; 439 delete rec;
439 } 440 }
440 ::munmap(map_addr, attribute.st_size ); 441 ::munmap(map_addr, attribute.st_size );
441 m_changed = false; // changed during add 442 m_changed = false; // changed during add
442 443
443 return true; 444 return true;
@@ -448,14 +449,16 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) {
448 OTimeZone utc = OTimeZone::utc(); 449 OTimeZone utc = OTimeZone::utc();
449 ev.setStartDateTime( utc.fromUTCDateTime( start ) ); 450 ev.setStartDateTime( utc.fromUTCDateTime( start ) );
450 ev.setEndDateTime ( utc.fromUTCDateTime( end ) ); 451 ev.setEndDateTime ( utc.fromUTCDateTime( end ) );
451 ev.setTimeZone( "UTC"); // make sure it is really utc 452 ev.setTimeZone( "UTC"); // make sure it is really utc
452 }else { 453 }else {
453 /* to current date time */ 454 /* to current date time */
455 qWarning(" Start is %d", start );
454 OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() ); 456 OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
455 QDateTime date = zone.toDateTime( start ); 457 QDateTime date = zone.toDateTime( start );
458 qWarning(" Start is %s", date.toString().latin1() );
456 ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) ); 459 ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
457 460
458 date = zone.toDateTime( end ); 461 date = zone.toDateTime( end );
459 ev.setEndDateTime ( zone.toDateTime( date, OTimeZone::current() ) ); 462 ev.setEndDateTime ( zone.toDateTime( date, OTimeZone::current() ) );
460 } 463 }
461 if ( rec && rec->doesRecur() ) { 464 if ( rec && rec->doesRecur() ) {
@@ -470,14 +473,16 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) {
470 if (alarmTime != -1 ) { 473 if (alarmTime != -1 ) {
471 QDateTime dt = ev.startDateTime().addSecs( -1*alarmTime*60 ); 474 QDateTime dt = ev.startDateTime().addSecs( -1*alarmTime*60 );
472 OPimAlarm al( snd , dt ); 475 OPimAlarm al( snd , dt );
473 ev.notifiers().add( al ); 476 ev.notifiers().add( al );
474 } 477 }
475 if ( m_raw.contains( ev.uid() ) || m_rep.contains( ev.uid() ) ) { 478 if ( m_raw.contains( ev.uid() ) || m_rep.contains( ev.uid() ) ) {
479 qWarning("already contains assign uid");
476 ev.setUid( 1 ); 480 ev.setUid( 1 );
477 } 481 }
482 qWarning("addind %d %s", ev.uid(), ev.description().latin1() );
478 if ( ev.hasRecurrence() ) 483 if ( ev.hasRecurrence() )
479 m_rep.insert( ev.uid(), ev ); 484 m_rep.insert( ev.uid(), ev );
480 else 485 else
481 m_raw.insert( ev.uid(), ev ); 486 m_raw.insert( ev.uid(), ev );
482 487
483} 488}
diff --git a/libopie/pim/opimmainwindow.h b/libopie/pim/opimmainwindow.h
index 34b8a71..dca3c82 100644
--- a/libopie/pim/opimmainwindow.h
+++ b/libopie/pim/opimmainwindow.h
@@ -43,13 +43,13 @@ protected slots:
43 43
44 /** create a new Records and return the uid */ 44 /** create a new Records and return the uid */
45 virtual int create() = 0; 45 virtual int create() = 0;
46 /** remove a record with UID == uid */ 46 /** remove a record with UID == uid */
47 virtual bool remove( int uid ) = 0; 47 virtual bool remove( int uid ) = 0;
48 /** beam the record with UID = uid */ 48 /** beam the record with UID = uid */
49 virtual void beam( int uid , int transport = IrDa) = 0; 49 virtual void beam( int uid ) = 0;
50 50
51 /** show the record with UID == uid */ 51 /** show the record with UID == uid */
52 virtual void show( int uid ) = 0; 52 virtual void show( int uid ) = 0;
53 /** edit the record */ 53 /** edit the record */
54 virtual void edit( int uid ) = 0; 54 virtual void edit( int uid ) = 0;
55 55
diff --git a/libopie/pim/test/oevent_test.cpp b/libopie/pim/test/oevent_test.cpp
index d83ee0b..9f16911 100644
--- a/libopie/pim/test/oevent_test.cpp
+++ b/libopie/pim/test/oevent_test.cpp
@@ -11,13 +11,14 @@ int main(int argc, char* argv ) {
11 ODateBookAccess::List list = acc.allRecords(); 11 ODateBookAccess::List list = acc.allRecords();
12 12
13 for( it = list.begin(); it != list.end(); ++it ){ 13 for( it = list.begin(); it != list.end(); ++it ){
14 OEvent ev = (*it); 14 OEvent ev = (*it);
15 qWarning("Summary: %s",ev.description().latin1() ); 15 qWarning("Summary: %s",ev.description().latin1() );
16 qWarning("Start: %s End: %s",ev.startDateTime().toString().latin1(), ev.endDateTime().toString().latin1() ); 16 qWarning("Start: %s End: %s",ev.startDateTime().toString().latin1(), ev.endDateTime().toString().latin1() );
17 qWarning("All Day: %d",ev.isAllDay() ); 17 qWarning("All Day: %d Recurrence: %d",ev.isAllDay(), ev.hasRecurrence() );
18 qWarning("UID %d", ev.uid() );
18 19
19 } 20 }
20 QDate date1(2003,02,01 ); 21 QDate date1(2003,02,01 );
21 QDate date2(2003,03,01 ); 22 QDate date2(2003,03,01 );
22 23
23 OEffectiveEvent::ValueList effList = acc.effectiveEvents( date1,date2 ); 24 OEffectiveEvent::ValueList effList = acc.effectiveEvents( date1,date2 );
@@ -25,9 +26,10 @@ int main(int argc, char* argv ) {
25 26
26 for( effIt = effList.begin(); effIt != effList.end(); ++effIt ){ 27 for( effIt = effList.begin(); effIt != effList.end(); ++effIt ){
27 OEffectiveEvent ef = (*effIt); 28 OEffectiveEvent ef = (*effIt);
28 qWarning("Summary: %s", ef.description().latin1() ); 29 qWarning("Summary: %s", ef.description().latin1() );
29 qWarning("Date: %s", ef.date().toString().latin1() ); 30 qWarning("Date: %s", ef.date().toString().latin1() );
30 } 31 }
32 acc.save();
31 33
32 return 0; 34 return 0;
33} 35}