Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Query objects directly from the storage layer; no need to fetch all for every operation

Browse source
This commit is contained in:
Thomas Bruederli 2012-05-09 19:02:46 +02:00
parent 86c1d510f1
commit b37784bb3b
1 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -38,8 +38,7 @@ class kolab_calendar
public $storage;
private $cal;
private $events;
private $id2uid;
private $events = array();
private $imap_folder = 'INBOX/Calendar';
private $search_fields = array('title', 'description', 'location', '_attendees');
private $sensitivity_map = array('public', 'private', 'confidential');
@ -175,17 +174,21 @@ class kolab_calendar
*/
public function get_event($id)
{
$this->_fetch_events();
// directly access storage object
if (!$this->events[$id] && ($record = $this->storage->get_object($id)))
$this->events[$id] = $this->_to_rcube_event($record);
// event not found, maybe a recurring instance is requested
if (!$this->events[$id]) {
$master_id = preg_replace('/-\d+$/', '', $id);
if ($this->events[$master_id] && $this->events[$master_id]['recurrence']) {
$master = $this->events[$master_id];
if ($record = $this->storage->get_object($master_id))
$this->events[$master_id] = $this->_to_rcube_event($record);
if (($master = $this->events[$master_id]) && $master['recurrence']) {
$this->_get_recurring_events($master, $master['start'], $master['start'] + 86400 * 365 * 10, $id);
}
}
return $this->events[$id];
}
@ -199,8 +202,16 @@ class kolab_calendar
*/
public function list_events($start, $end, $search = null, $virtual = 1)
{
$this->_fetch_events();
// query Kolab storage
$query = array(
array('dtstart', '<=', $end),
array('dtend', '>=', $start),
);
foreach ((array)$this->storage->select($query) as $record) {
$event = $this->_to_rcube_event($record);
$this->events[$event['id']] = $event;
}
if (!empty($search))
$search = mb_strtolower($search);
@ -345,22 +356,6 @@ class kolab_calendar
return false;
}
/**
* Simply fetch all records and store them in private member vars
* We thereby rely on cahcing done by the Horde classes
*/
private function _fetch_events()
{
if (!isset($this->events)) {
$this->events = array();
foreach ((array)$this->storage->get_objects() as $record) {
$event = $this->_to_rcube_event($record);
$this->events[$event['id']] = $event;
}
}
}
/**
* Create instances of a recurring event