nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-24 02:24:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrating REPORT calendar-query to AwlQuery.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-16 15:08:00 +13:00
parent 7e032ddc38
commit 73891a9fc0
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
inc/caldav-REPORT-calquery.php
View File

@ -97,6 +97,7 @@ $need_post_filter = false;
function SqlFilterFragment( $filter, $components, $property = null, $parameter = null ) { function SqlFilterFragment( $filter, $components, $property = null, $parameter = null ) {
global $need_post_filter; global $need_post_filter;
$sql = ""; $sql = "";
$params = array();
if ( !is_array($filter) ) { if ( !is_array($filter) ) {
dbg_error_log( "calquery", "Filter is of type '%s', but should be an array of XML Tags.", gettype($filter) ); dbg_error_log( "calquery", "Filter is of type '%s', but should be an array of XML Tags.", gettype($filter) );
} }
@ -145,8 +146,9 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$start = $v->GetAttribute("start"); $start = $v->GetAttribute("start");
$finish = $v->GetAttribute("end"); $finish = $v->GetAttribute("end");
if ( isset($start) || isset($finish) ) { if ( isset($start) || isset($finish) ) {
$sql .= "AND (rrule_event_overlaps( dtstart, dtend, rrule, ".qpg($start).", ".qpg($finish)." ) "; $sql .= ' AND (rrule_event_overlaps( dtstart, dtend, rrule, :time_range_start, :time_range_end ) OR event_has_exceptions(caldav_data.caldav_data) ) ';
$sql .= sprintf( "OR event_has_exceptions(caldav_data.caldav_data) )" ); $params[':time_range_start'] = $start;
$params[':time_range_end'] = $finish;
} }
break; break;
@ -163,10 +165,11 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$comparison = 'ILIKE'; $comparison = 'ILIKE';
break; break;
} }
dbg_error_log("calquery", " text-match: (%s IS NULL OR %s%s %s %s) ", $property, (isset($negate) && strtolower($negate) == "yes" ? "NOT ": ""), $params[':text_match'] = '%'.$search.'%';
$property, $comparison, qpg("%".$search."%") ); dbg_error_log("calquery", " text-match: (%s IS NULL OR %s%s %s '%s') ", $property, (isset($negate) && strtolower($negate) == "yes" ? "NOT ": ""),
$sql .= sprintf( "AND (%s IS NULL OR %s%s %s %s) ", $property, (isset($negate) && strtolower($negate) == "yes" ? "NOT ": ""), $property, $comparison, $params[':text_match'] );
$property, $comparison, qpg("%".$search."%") ); $sql .= sprintf( "AND (%s IS NULL OR %s%s %s :text_match) ", $property, (isset($negate) && strtolower($negate) == "yes" ? "NOT ": ""),
$property, $comparison );
break; break;
case 'urn:ietf:params:xml:ns:caldav:comp-filter': case 'urn:ietf:params:xml:ns:caldav:comp-filter':
@ -178,7 +181,10 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$subfilter = $v->GetContent(); $subfilter = $v->GetContent();
if ( is_array( $subfilter ) ) { if ( is_array( $subfilter ) ) {
$success = SqlFilterFragment( $subfilter, $components, $property, $parameter ); $success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
if ( $success === false ) continue; else $sql .= $success; if ( $success === false ) continue; else {
$sql .= $success['sql'];
$params = array_merge( $params, $success['params'] );
}
} }
break; break;
@ -215,7 +221,10 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
} }
$subfilter = $v->GetContent(); $subfilter = $v->GetContent();
$success = SqlFilterFragment( $subfilter, $components, $property, $parameter ); $success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
if ( $success === false ) continue; else $sql .= $success; if ( $success === false ) continue; else {
$sql .= $success['sql'];
$params = array_merge( $params, $success['params'] );
}
break; break;
case 'urn:ietf:params:xml:ns:caldav:param-filter': case 'urn:ietf:params:xml:ns:caldav:param-filter':
@ -224,7 +233,10 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$parameter = $v->GetAttribute("name"); $parameter = $v->GetAttribute("name");
$subfilter = $v->GetContent(); $subfilter = $v->GetContent();
$success = SqlFilterFragment( $subfilter, $components, $property, $parameter ); $success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
if ( $success === false ) continue; else $sql .= $success; if ( $success === false ) continue; else {
$sql .= $success['sql'];
$params = array_merge( $params, $success['params'] );
}
break; break;
default: default:
@ -233,7 +245,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
} }
} }
dbg_error_log("calquery", "Generated SQL was '%s'", $sql ); dbg_error_log("calquery", "Generated SQL was '%s'", $sql );
return $sql; return array( 'sql' => $sql, 'params' => $params );
} }
/** /**
@ -246,9 +258,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
*/ */
function BuildSqlFilter( $filter ) { function BuildSqlFilter( $filter ) {
$components = array(); $components = array();
$sql = SqlFilterFragment( $filter, $components ); return SqlFilterFragment( $filter, $components );
if ( $sql === false ) return "";
return $sql;
} }
@ -274,26 +284,32 @@ if ( ! ($collection->IsCalendar() || $collection->IsSchedulingCollection()) ) {
* AND caldav_data.caldav_type = 'VEVENT' ORDER BY caldav_data.user_no, caldav_data.dav_name; * AND caldav_data.caldav_type = 'VEVENT' ORDER BY caldav_data.user_no, caldav_data.dav_name;
*/ */
$where = " WHERE caldav_data.collection_id = " . $collection->resource_id(); $params = array();
$where = ' WHERE caldav_data.collection_id = ' . $collection->resource_id();
if ( is_array($qry_filters) ) { if ( is_array($qry_filters) ) {
dbg_log_array( "calquery", "qry_filters", $qry_filters, true ); dbg_log_array( "calquery", "qry_filters", $qry_filters, true );
$where .= BuildSqlFilter( $qry_filters ); $components = array();
$filter_fragment = SqlFilterFragment( $qry_filters, $components );
if ( $filter_fragment !== false ) {
$where .= ' '.$filter_fragment['sql'];
$params = $filter_fragment['params'];
}
} }
if ( $collection->Privileges() != privilege_to_bits('DAV::all') ) { if ( $collection->Privileges() != privilege_to_bits('DAV::all') ) {
$where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) "; $where .= " AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) ";
} }
if ( isset($c->hide_TODO) && $c->hide_TODO && ! $collection->HavePrivilegeTo('DAV::write-content') ) { if ( isset($c->hide_TODO) && $c->hide_TODO && ! $collection->HavePrivilegeTo('DAV::write-content') ) {
$where .= "AND caldav_data.caldav_type NOT IN ('VTODO') "; $where .= " AND caldav_data.caldav_type NOT IN ('VTODO') ";
} }
if ( isset($c->hide_older_than) && intval($c->hide_older_than > 0) ) { if ( isset($c->hide_older_than) && intval($c->hide_older_than > 0) ) {
$where .= " AND calendar_item.dtstart > (now() - interval '".intval($c->hide_older_than)." days') "; $where .= " AND calendar_item.dtstart > (now() - interval '".intval($c->hide_older_than)." days') ";
} }
$sql = "SELECT * FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name)". $where; $sql = 'SELECT * FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name)'. $where;
if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= " ORDER BY dav_id"; if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= " ORDER BY dav_id";
$qry = new AwlQuery( $sql ); $qry = new AwlQuery( $sql, $params );
if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows() > 0 ) { if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows() > 0 ) {
while( $calendar_object = $qry->Fetch() ) { while( $calendar_object = $qry->Fetch() ) {
if ( !$need_post_filter || apply_filter( $qry_filters, $calendar_object ) ) { if ( !$need_post_filter || apply_filter( $qry_filters, $calendar_object ) ) {

2
inc/test-RRULE.php
View File

@ -40,7 +40,7 @@ class RRuleTest {
function SQLTest() { function SQLTest() {
$result = ''; $result = '';
$sql = "SELECT event_instances::timestamp AS event_date FROM event_instances(?,?) LIMIT 30;"; $sql = "SELECT event_instances::timestamp AS event_date FROM event_instances(?,?) LIMIT 30;";
$qry = new PgQuery($sql, $this->dtstart, $this->recur); $qry = new AwlQuery($sql, $this->dtstart, $this->recur);
// printf( "%s\n", $qry->querystring); // printf( "%s\n", $qry->querystring);
if ( $qry->Exec("test") && $qry->rows > 0 ) { if ( $qry->Exec("test") && $qry->rows > 0 ) {
$i = 0; $i = 0;