AI search: judge models (TypeSafe Jev) and natural language search - #5721 - fix search

inc/classes/BxDolSearch.php

@@ -1243,6 +1243,19 @@ class BxDolSearchResult implements iBxDolReplaceable
                        case 'like':
                             $sqlCondition .= "LIKE " . $oDb->escape('%' . $aValue['value'] . '%');
                             break;
+                       case 'between':
+                            $sqlCondition = '';
+                            if(is_array($aValue['value'])) {
+                                $aRange = array_values($aValue['value']);
+                                $aParts = [];
+                                if(($mixedMin = $aRange[0] ?? '') !== '' && $mixedMin !== null)
+                                    $aParts[] = "`{$sFieldTable}`.`{$aValue['field']}` >= " . $oDb->escape($mixedMin);
+                                if(($mixedMax = $aRange[1] ?? '') !== '' && $mixedMax !== null)
+                                    $aParts[] = "`{$sFieldTable}`.`{$aValue['field']}` <= " . $oDb->escape($mixedMax);
+                                if($aParts)
+                                    $sqlCondition = '(' . implode(' AND ', $aParts) . ')';
+                            }
+                            break;
                        case 'in':
                        case 'not in':
                             $sValuesString = $this->getMultiValues($aValue['value']);

modules/base/general/classes/BxBaseModGeneralSearchResult.php

@@ -101,7 +101,9 @@ class BxBaseModGeneralSearchResult extends BxTemplSearchResult
             if(!empty($this->_aParams['filters']['values']) && is_array($this->_aParams['filters']['values']))
                 $aResult['params']['filters'] = $this->_aParams['filters']['values'];
 
-            $aResult['filters'] = $oModule->_oTemplate->getBrowsingFilters(array_merge(['mode' => $this->_sMode], $this->_aParams));
+            $mixedFilters = $oModule->_oTemplate->getBrowsingFilters(array_merge(['mode' => $this->_sMode], $this->_aParams));
+            if($mixedFilters)
+                $aResult['filters'] = $mixedFilters;
         }
 
         return $aResult;
@@ -115,6 +117,96 @@ class BxBaseModGeneralSearchResult extends BxTemplSearchResult
 
         if(!empty($aParams['filter']) && is_array($aParams['filter']))
             $this->addConditionsForFilter($CNF, $sMode, $aParams);
+
+        $this->addConditionsForSearchFilters($CNF, $aParams);
+    }
+
+    /**
+     * Search-form values posted as params.filters ({title: "toy"}).
+     * Operators come from the module's extended search fields, so a value
+     * is applied only when that field is an active search field on the entries table.
+     */
+    protected function addConditionsForSearchFilters($CNF, $aParams)
+    {
+        $aValues = [];
+        if(!empty($aParams['filters']['values']) && is_array($aParams['filters']['values']))
+            $aValues = $aParams['filters']['values'];
+        elseif(!empty($aParams['filters']) && is_array($aParams['filters']) && !isset($aParams['filters']['onclick']))
+            $aValues = $aParams['filters'];
+
+        if(!$aValues || !($sModule = $this->getModuleName()))
+            return;
+
+        $sTable = !empty($CNF['TABLE_ENTRIES']) ? $CNF['TABLE_ENTRIES'] : ($this->aCurrent['table'] ?? '');
+        if($sTable === '')
+            return;
+
+        $oDb = BxDolDb::getInstance();
+        $aFields = $oDb->getPairs(
+            "SELECT `name`, `search_operator` FROM `sys_search_extended_fields` WHERE `object` = :object AND `active` = 1",
+            'name',
+            'search_operator',
+            ['object' => $sModule]
+        );
+        if(empty($aFields) || !is_array($aFields))
+            return;
+
+        foreach($aValues as $sName => $mixedValue) {
+            if(!is_string($sName) || !isset($aFields[$sName]) || !preg_match('/^[A-Za-z0-9_]+$/', $sName))
+                continue;
+
+            $sOperator = $aFields[$sName];
+            if($sOperator === '' || $this->_isSearchFilterEmpty($mixedValue))
+                continue;
+
+            if(!$oDb->isFieldExists($sTable, $sName))
+                continue;
+
+            $aRestriction = [
+                'field' => $sName,
+                'table' => $sTable,
+                'operator' => $sOperator,
+                'value' => $mixedValue,
+            ];
+
+            switch($sOperator) {
+                case 'like':
+                case '=':
+                    if(is_array($mixedValue))
+                        continue 2;
+                    break;
+
+                case 'in':
+                case 'not in':
+                    $aRestriction['value'] = is_array($mixedValue) ? $mixedValue : [$mixedValue];
+                    break;
+
+                case 'between':
+                    if(!is_array($mixedValue))
+                        continue 2;
+                    break;
+
+                default:
+                    continue 2;
+            }
+
+            $this->aCurrent['restriction']['search_' . $sName] = $aRestriction;
+        }
+    }
+
+    protected function _isSearchFilterEmpty($mixedValue)
+    {
+        if($mixedValue === null || $mixedValue === '' || $mixedValue === false)
+            return true;
+
+        if(!is_array($mixedValue))
+            return false;
+
+        foreach($mixedValue as $mixedItem)
+            if(!$this->_isSearchFilterEmpty($mixedItem))
+                return false;
+
+        return true;
     }
 
     protected function addConditionsForAuthorStatus($CNF)

modules/base/general/classes/BxBaseModGeneralTemplate.php

@@ -510,6 +510,15 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
         return $this->parseHtmlByName('favorite-list-info.html', array('bx_repeat:items' => $aListsTmpl, 'author' => $oProfile->getUnit()));
     }
 
+    /**
+     * Modules with a browsing-filter form (Spaces, Events) override this.
+     * Others have nothing to render; calling the missing method fataled the API.
+     */
+    protected function _getBrowsingFiltersContent($aParams)
+    {
+        return '';
+    }
+
     public function getBrowsingFilters($aParams)
     {
         if(empty($aParams['mode']))