nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-09-22 06:29:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support multiple text-match elements within a filter query.

Browse Source
This commit is contained in:
“Paul 2014-06-23 21:03:01 +02:00
parent c03b882728
commit 9dc026eb28
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,11 +88,13 @@ function apply_filter( $filters, $item ) {
/** /**
* Process a filter fragment returning an SQL fragment * Process a filter fragment returning an SQL fragment
* Changed by GitHub user moosemark 2013-11-29 to allow multiple text-matches - SQL parameter now has numeric count appended.
*/ */
$need_post_filter = false; $need_post_filter = false;
$range_filter = null; $range_filter = null;
function SqlFilterFragment( $filter, $components, $property = null, $parameter = null ) { $parameter_match_num = 0;
global $need_post_filter, $range_filter, $target_collection; function SqlFilterFragment( $filter, $components, $property = null, $parameter = null) {
global $need_post_filter, $range_filter, $target_collection, $parameter_match_num;
$sql = ""; $sql = "";
$params = array(); $params = array();
if ( !is_array($filter) ) { if ( !is_array($filter) ) {
@ -180,10 +182,13 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$comparison = 'ILIKE'; $comparison = 'ILIKE';
break; break;
} }
$params[':text_match'] = '%'.$search.'%'; /* Append the match number to the SQL parameter, to allow multiple text match conditions within the same query */
$fragment = sprintf( 'AND (%s%s %s :text_match) ', $params[':text_match_'.$parameter_match_num] = '%'.$search.'%';
$fragment = sprintf( 'AND (%s%s %s :text_match_%s) ',
(isset($negate) && strtolower($negate) == "yes" ? $property.' IS NULL OR NOT ': ''), (isset($negate) && strtolower($negate) == "yes" ? $property.' IS NULL OR NOT ': ''),
$property, $comparison ); $property, $comparison, $parameter_match_num );
$parameter_match_num++;
dbg_error_log('calquery', ' text-match: %s', $fragment ); dbg_error_log('calquery', ' text-match: %s', $fragment );
$sql .= $fragment; $sql .= $fragment;
break; break;
@ -233,6 +238,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
case 'COMPLETED': /** @todo this should be moved into the properties supported in SQL. */ case 'COMPLETED': /** @todo this should be moved into the properties supported in SQL. */
default: default:
$need_post_filter = true; $need_post_filter = true;
unset($subproperty);
dbg_error_log("calquery", "Could not handle 'prop-filter' on %s in SQL", $propertyname ); dbg_error_log("calquery", "Could not handle 'prop-filter' on %s in SQL", $propertyname );
continue; continue;
} }