Correct handling of [BLANK] and [SET]; correct handling of #gt# and #lt#

collectiveaccess · Nov 4, 2021 · 11dbb63 · 11dbb63
1 parent 00b9fc5
commit 11dbb63
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/lib/Plugins/SearchEngine/SqlSearch2.php b/app/lib/Plugins/SearchEngine/SqlSearch2.php
@@ -349,8 +349,8 @@ private function _processQueryTerm(int $subject_tablenum, $query) {
 	 	$text = join(' ', $this->_tokenize($term->text, true));
 
 	 	$blank_val = caGetBlankLabelText($subject_tablenum);
-	 	$is_blank = ((mb_strtolower("[{$blank_val}]") === mb_strtolower($text)) || (mb_strtolower("[BLANK]") === mb_strtolower($text)));
-	 	$is_not_blank = (mb_strtolower("["._t('SET')."]") === mb_strtolower($text));
+	 	$is_blank = ((mb_strtolower("[{$blank_val}]") === mb_strtolower($term->text)) || (mb_strtolower("[BLANK]") === mb_strtolower($term->text)));
+	 	$is_not_blank = (mb_strtolower("["._t('SET')."]") === mb_strtolower($term->text));
 
 	 	$word_field = 'sw.word';
 
@@ -1903,15 +1903,15 @@ private function _queryForDateRangeAttribute($attrval, $ap, $text, $text_upper)
 		switch($modifier) {
 			case '#gt#':
 				$sql_where = "({$sfield} > ?)"; 
-				$params = [$dates['start']];
+				$params = [$dates['end']];
 				break;
 			case '#gt=':
 				$sql_where = "({$sfield} >= ?)"; 
 				$params = [$dates['start']];
 				break;
 			case '#lt#':
 				$sql_where = "({$efield} < ?)"; 
-				$params = [$dates['end']];
+				$params = [$dates['start']];
 				break;
 			case '#lt=':
 				$sql_where = "({$efield} <= ?)";