extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 06:19:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

* CalDAV/CardDAV: removed unnecessary (double) etag generation and improved calendar etag generation for recurring events

Browse Source
This commit is contained in:
Ralf Becker 2013-02-25 11:18:32 +00:00
parent c6cb7196dc
commit 0e957053dc
3 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
calendar/inc/class.calendar_bo.inc.php
View File

@ -1937,33 +1937,33 @@ class calendar_bo
$etag .= ':'.$entry['modified']; $etag .= ':'.$entry['modified'];
// include exception etags into our own etag, if exceptions are included // include exception etags into our own etag, if exceptions are included
if ($client_share_uid_excpetions && !empty($entry['uid']) && if ($client_share_uid_excpetions && //!empty($entry['uid']) &&
$entry['recur_type'] != MCAL_RECUR_NONE && $entry['recur_exception']) $entry['recur_type'] != MCAL_RECUR_NONE && $entry['recur_exception'])
{ {
$events =& $this->search(array( foreach($this->so->get_cal_data(array(
//'query' => array('cal_uid' => $entry['uid']), 'cal_reference' => $entry['id'],
'query' => array('cal_reference' => $entry['id']), ), 'cal_id,cal_reference,cal_etag,cal_modified'.(!$master_only ? ',cal_user_modified' : '')) as $recurrence)
'filter' => 'owner', // return all possible entries
'daywise' => false,
'enum_recuring' => false,
'date_format' => 'server',
'no_total' => true,
));
foreach($events as $k => &$recurrence)
{ {
$recurrence = egw_db::strip_array_keys($data, 'cal_');
if ($recurrence['reference'] && $recurrence['id'] != $entry['id']) // ignore series master if ($recurrence['reference'] && $recurrence['id'] != $entry['id']) // ignore series master
{ {
$exception_etag = $this->get_etag($recurrence, $nul); // modified need to be max from modified and user_modified
if (!$master_only && $recurrence['modified'] < $recurrence['user_modified'])
{
$recurrence['modified'] = $recurrence['user_modified'];
}
$exception_etag = $this->get_etag($recurrence);
// if $master_only, only add cal_etag, not max. user modification date // if $master_only, only add cal_etag, not max. user modification date
if ($master_only) list(,$exception_etag) = explode(':',$exception_etag); if ($master_only) list(,$exception_etag) = explode(':',$exception_etag);
$exception_etags .= ':'.$this->get_etag($recurrence, $nul); $exception_etags .= ':'.$exception_etag;
} }
} }
if ($exception_etags) if ($exception_etags)
{ {
$etag .= ':'.md5($exception_etags); // limit size, as there can be many exceptions $etag .= ':'.md5($exception_etags); // limit size, as there can be many exceptions
} }
//error_log(__METHOD__."($entry[id]: $entry[title]) returning $etag ".function_backtrace());
} }
//error_log(__METHOD__ . "($entry[id],$client_share_uid_excpetions) entry=".array2string($entry)." --> etag=$etag"); //error_log(__METHOD__ . "($entry[id],$client_share_uid_excpetions) entry=".array2string($entry)." --> etag=$etag");
return $etag; return $etag;

23
calendar/inc/class.calendar_so.inc.php
View File

@ -370,6 +370,29 @@ class calendar_so
$where,__LINE__,__FILE__,false,'','calendar',0,'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn(); $where,__LINE__,__FILE__,false,'','calendar',0,'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
} }
/**
* Query calendar main table and return iterator of query
*
* Use as: foreach(get_cal_data() as $data) { $data = egw_db::strip_array_keys($data, 'cal_'); // do something with $data
*
* @param array $query filter, keys have to use 'cal_' prefix
* @param string|array $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified' cols to query
* @return Iterator as egw_db::select
*/
function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified', $include_user_modified=false)
{
if (!is_array($cols)) $cols = explode(',', $cols);
// special handling of cal_user_modified "pseudo" column
if (($key = array_search('cal_user_modified', $cols)) !== false)
{
$cols[$key] = $this->db->unix_timestamp('(SELECT MAX(cal_user_modified) FROM '.
$this->user_table.' WHERE '.$this->cal_table.'.cal_id='.$this->user_table.'.cal_id)').
' AS cal_user_modified';
}
return $this->db->select($this->cal_table, $cols, $query, __LINE__, __FILE__);
}
/** /**
* generate SQL to filter after a given category (incl. subcategories) * generate SQL to filter after a given category (incl. subcategories)
* *

6
phpgwapi/inc/class.groupdav_handler.inc.php
View File

@ -539,8 +539,12 @@ abstract class groupdav_handler
*/ */
public function add_resource($path, array $entry, array $props) public function add_resource($path, array $entry, array $props)
{ {
// only run get_etag, if we really need it, as it might be expensive (eg. calendar)
if (!isset($props['getetag']))
{
$props['getetag'] = $this->get_etag($entry);
}
foreach(array( foreach(array(
'getetag' => $this->get_etag($entry),
'getcontenttype' => 'text/calendar', 'getcontenttype' => 'text/calendar',
'getlastmodified' => $entry['modified'], 'getlastmodified' => $entry['modified'],
'displayname' => $entry['title'], 'displayname' => $entry['title'],