Fix further issues with prop-filter handling.

This commit is contained in:
Andrew McMillan 2011-06-03 13:59:35 -07:00
parent 5e3ed8dedc
commit 2a1af89c77

View File

@ -179,10 +179,11 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
break; break;
} }
$params[':text_match'] = '%'.$search.'%'; $params[':text_match'] = '%'.$search.'%';
dbg_error_log("calquery", " text-match: (%s IS NULL OR %s%s %s '%s') ", $property, (isset($negate) && strtolower($negate) == "yes" ? "NOT ": ""), $fragment = sprintf( 'AND (%s%s %s :text_match) ',
$property, $comparison, $params[':text_match'] ); (isset($negate) && strtolower($negate) == "yes" ? $property.' IS NULL OR NOT ': ''),
$sql .= sprintf( "AND (%s IS NULL OR %s%s %s :text_match) ", $property, (isset($negate) && strtolower($negate) == "yes" ? "NOT ": ""),
$property, $comparison ); $property, $comparison );
dbg_error_log('calquery', ' text-match: %s', $fragment );
$sql .= $fragment;
break; break;
case 'urn:ietf:params:xml:ns:caldav:comp-filter': case 'urn:ietf:params:xml:ns:caldav:comp-filter':