# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1441299650 -7200
# Node ID fd3d2d3c348b92518a668c5c9d87cc9f287e3a26
# Parent  95a546dac1bfc5e2e79fcc8882c578dd3c03aa18
Use the Object convenience method to make free/busy periods.

diff -r 95a546dac1bf -r fd3d2d3c348b imipweb/resource.py
--- a/imipweb/resource.py	Thu Sep 03 17:28:00 2015 +0200
+++ b/imipweb/resource.py	Thu Sep 03 19:00:50 2015 +0200
@@ -23,7 +23,7 @@
 from imiptools.client import Client
 from imiptools.data import get_uri, uri_values
 from imiptools.dates import get_recurrence_start_point
-from imiptools.period import FreeBusyPeriod, remove_period, remove_affected_period
+from imiptools.period import remove_period, remove_affected_period
 from imipweb.env import CGIEnvironment
 import babel.dates
 import imip_store
@@ -138,22 +138,11 @@
                 recurrenceids = self._get_recurrences(uid)
 
                 # Obtain only active periods, not those replaced by redefined
-                # recurrences.
+                # recurrences, converting to free/busy periods.
 
                 for p in obj.get_active_periods(recurrenceids, self.get_tzid(), self.get_window_end()):
-
-                    # Convert the periods to more substantial free/busy items.
+                    summary.append(obj.get_freebusy_period(p))
 
-                    summary.append(
-                        FreeBusyPeriod(
-                            p.get_start_point(),
-                            p.get_end_point(),
-                            uid,
-                            obj.get_value("TRANSP"),
-                            recurrenceid,
-                            obj.get_value("SUMMARY"),
-                            obj.get_value("ORGANIZER")
-                            ))
         return summary
 
     # Preference methods.