Fixed backend for bug 133331 :[RFE] Allow events to span multiple days

calendar/libxpical/oeICalContainerImpl.cpp

@@ -654,7 +654,7 @@ oeICalContainerImpl::GetNextNEvents( PRTime datems, PRInt32 maxcount, nsISimpleE
 NS_IMETHODIMP 
 oeICalContainerImpl::AddObserver(oeIICalObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalContainerImpl::AddObserver()\n" );
 #endif
     if( observer ) {
@@ -678,7 +678,7 @@ oeICalContainerImpl::AddObserver(oeIICalObserver *observer)
 NS_IMETHODIMP 
 oeICalContainerImpl::RemoveObserver(oeIICalObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalContainerImpl::RemoveObserver()\n" );
 #endif
     if( observer ) {
@@ -700,7 +700,7 @@ oeICalContainerImpl::RemoveObserver(oeIICalObserver *observer)
 NS_IMETHODIMP 
 oeICalContainerImpl::AddTodoObserver(oeIICalTodoObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalContainerImpl::AddTodoObserver()\n" );
 #endif
     if( observer ) {
@@ -724,7 +724,7 @@ oeICalContainerImpl::AddTodoObserver(oeIICalTodoObserver *observer)
 NS_IMETHODIMP 
 oeICalContainerImpl::RemoveTodoObserver(oeIICalTodoObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalContainerImpl::RemoveTodoObserver()\n" );
 #endif
     if( observer ) {

calendar/libxpical/oeICalEventImpl.cpp

@@ -2458,12 +2458,31 @@ NS_IMETHODIMP oeICalEventDisplayImpl::SetDisplayDate( PRTime aNewVal )
     return NS_OK;
 }
 
+NS_IMETHODIMP oeICalEventDisplayImpl::GetDisplayDateEnd( PRTime *aRetVal )
+{
+#ifdef ICAL_DEBUG_ALL
+    printf( "oeICalEventDisplayImpl::GetDisplayDateEnd()\n" );
+#endif
+    *aRetVal = ConvertToPrtime( m_displaydateend );
+    return NS_OK;
+}
+    
+
+NS_IMETHODIMP oeICalEventDisplayImpl::SetDisplayDateEnd( PRTime aNewVal )
+{
+#ifdef ICAL_DEBUG_ALL
+    printf( "oeICalEventDisplayImpl::SetDisplayDateEnd()\n" );
+#endif
+    m_displaydateend = ConvertFromPrtime( aNewVal );
+    return NS_OK;
+}
+
 NS_IMETHODIMP oeICalEventDisplayImpl::GetEvent( oeIICalEvent **ev )
 {
 #ifdef ICAL_DEBUG_ALL
     printf( "oeICalEventDisplayImpl::GetEvent()\n" );
 #endif
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "WARNING: .event is no longer needed to access event fields\n" );
 #endif
     *ev = mEvent;

calendar/libxpical/oeICalEventImpl.h

@@ -169,6 +169,7 @@ public:
     virtual ~oeICalEventDisplayImpl();
 private:
     icaltimetype m_displaydate;
+    icaltimetype m_displaydateend;
     nsCOMPtr<oeIICalEvent> mEvent;
 };
 

calendar/libxpical/oeICalImpl.cpp

@@ -1337,6 +1337,53 @@ oeICalImpl::GetEventsForDay( PRTime datems, nsISimpleEnumerator **datelist, nsIS
     return GetEventsForRange(checkdateinms ,checkenddateinms ,datelist ,eventlist );
 }
 
+void oeICalImpl::ChopAndAddEventToEnum( struct icaltimetype initialdisplaydate,
+                                        struct icaltimetype checkenddate,
+                                        nsISimpleEnumerator **eventlist, oeICalEventImpl* event ) {
+
+    nsCOMPtr<oeEventEnumerator> eventEnum;
+    eventEnum = (oeEventEnumerator *)*eventlist;
+
+    oeIDateTime *start;
+    oeIDateTime *end;
+    event->GetStart( &start );
+    event->GetEnd( &end );
+
+    struct icaltimetype startdate = initialdisplaydate;
+    struct icaldurationtype eventlength = icaltime_subtract( ((oeDateTimeImpl *)end)->m_datetime, ((oeDateTimeImpl *)start)->m_datetime );
+    struct icaltimetype eventenddate = icaltime_add( startdate, eventlength );
+
+    do {
+        struct icaltimetype endofday = startdate;
+        endofday.hour = 23; endofday.minute = 59; endofday.second = 59;
+        oeIICalEventDisplay* eventDisplay;
+        nsresult rv = NS_NewICalEventDisplay( event, &eventDisplay );
+        if( NS_FAILED( rv ) ) {
+        #ifdef ICAL_DEBUG
+            printf( "oeICalImpl::ChopAndAddEventToEnum() : WARNING Cannot create oeIICalEventDisplay instance: %x\n", rv );
+        #endif
+            return;
+        }
+        eventEnum->AddEvent( eventDisplay );
+        PRTime startdateinms = ConvertToPrtime( startdate );
+        eventDisplay->SetDisplayDate( startdateinms );
+        PRTime enddateinms;
+        
+        if( icaltime_compare( endofday, eventenddate ) < 0 ) {
+            enddateinms = ConvertToPrtime( endofday );
+            eventDisplay->SetDisplayDateEnd( enddateinms );
+            startdate = endofday;
+            icaltime_adjust( &startdate, 0, 0, 0, 1 );
+            if( icaltime_compare( startdate, checkenddate ) >= 0 )
+                break;
+        } else {
+            enddateinms = ConvertToPrtime( eventenddate );
+            eventDisplay->SetDisplayDateEnd( enddateinms );
+            break;
+        }
+    } while ( 1 );
+}
+
 NS_IMETHODIMP
 oeICalImpl::GetEventsForRange( PRTime checkdateinms, PRTime checkenddateinms, nsISimpleEnumerator **datelist, nsISimpleEnumerator **eventlist ) {
 #ifdef ICAL_DEBUG_ALL
@@ -1378,7 +1425,7 @@ oeICalImpl::GetEventsForRange( PRTime checkdateinms, PRTime checkenddateinms, ns
                     oeIICalEvent* tmpevent = tmplistptr->event;
                     icaltimetype next = ((oeICalEventImpl *)tmpevent)->GetNextRecurrence( checkdate );
                     if( !icaltime_is_null_time( next ) && (icaltime_compare( nextcheckdate, next ) == 0) ) {
-                        eventEnum->AddEvent( tmpevent );
+                        ChopAndAddEventToEnum( nextcheckdate, checkenddate, eventlist, (oeICalEventImpl *)tmpevent );
                         PRTime nextdateinms = ConvertToPrtime( nextcheckdate );
                         dateEnum->AddDate( nextdateinms );
                     }
@@ -1540,7 +1587,7 @@ oeICalImpl::GetNextNEvents( PRTime datems, PRInt32 maxcount, nsISimpleEnumerator
 NS_IMETHODIMP 
 oeICalImpl::AddObserver(oeIICalObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalImpl::AddObserver()\n" );
 #endif
     if( observer ) {
@@ -1554,7 +1601,7 @@ oeICalImpl::AddObserver(oeIICalObserver *observer)
 NS_IMETHODIMP 
 oeICalImpl::RemoveObserver(oeIICalObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalImpl::RemoveObserver()\n" );
 #endif
     if( observer ) {
@@ -1572,7 +1619,7 @@ oeICalImpl::RemoveObserver(oeIICalObserver *observer)
 NS_IMETHODIMP 
 oeICalImpl::AddTodoObserver(oeIICalTodoObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalImpl::AddTodoObserver()\n" );
 #endif
     if( observer ) {
@@ -1586,7 +1633,7 @@ oeICalImpl::AddTodoObserver(oeIICalTodoObserver *observer)
 NS_IMETHODIMP 
 oeICalImpl::RemoveTodoObserver(oeIICalTodoObserver *observer)
 {
-#ifdef ICAL_DEBUG
+#ifdef ICAL_DEBUG_ALL
     printf( "oeICalImpl::RemoveTodoObserver()\n" );
 #endif
     if( observer ) {

calendar/libxpical/oeICalImpl.h

@@ -251,6 +251,9 @@ private:
     char serveraddr[200];
     oeICalFilter *m_filter;
     bool SatisfiesFilter( oeIICalTodo *comp );
+    void ChopAndAddEventToEnum( struct icaltimetype initialdisplaydate,
+                                        struct icaltimetype checkenddate,
+                                        nsISimpleEnumerator **eventlist, oeICalEventImpl* event );
 };
 
 #endif

calendar/libxpical/oeIICal.idl

@@ -153,6 +153,7 @@ interface oeIICalEventDisplay : oeIICalEvent
 {
     readonly attribute oeIICalEvent event;
     attribute PRTime displayDate;
+    attribute PRTime displayDateEnd;
 };
 
 [scriptable, uuid(d44987b4-1dd1-11b2-9783-8a78ed685caf)]