Es solr support 12

README.md

@@ -11,6 +11,7 @@ Upgrading to 2.0.0 from 1.* is highly recommended, but it does introduce some ri
 
 Important changes from 1.* to 2.0.0:
 - The namespace has been changed from `sisea` to `simplesearch`. If you're using custom System Settings, then please migrate them.
+- The placeholder prefix has also been changed from `sisea` to `simplesearch`.
 - The ElasticSearch and SOLR drivers have been removed, because they were in need of improvements. Future drivers should be seperate addons. Feel free to ask us for help here.
 
 ## Autosuggest
@@ -35,3 +36,8 @@ $('.simplesearch-search-form input[type="text"]').on('keyup', function () {
 
 ## Bugs and feature requests
 We value your feedback, feature requests and bug reports. Please issue them on [Github](https://github.com/Sterc/SimpleSearch/issues/new).
+
+# Free Extra
+This is a free extra and the code is publicly available for you to change. The extra is being actively maintained and you're free to put in pull requests which match our roadmap. Please create an issue if the pull request differs from the roadmap so we can make sure we're on the same page.
+
+Need help? [Approach our support desk for paid premium support.](mailto:[email protected])

_build/config.json

@@ -3,7 +3,7 @@
   "lowCaseName": "simplesearch",
   "description": "A simple search solution for MODX Revolution. Loosely based on AjaxSearch for Evolution (minus the ajax). Only searches Resources; does not search dynamic content.",
   "author": "Sterc",
-  "version": "2.1.0-pl",
+  "version": "2.1.2-pl",
   "package":{
     "elements": {
       "chunks": [{

core/components/simplesearch/docs/changelog.txt

@@ -1,5 +1,15 @@
 Changelog for SimpleSearch.
 
+SimpleSearch 2.1.2
+========================================================================
+- Show facet results when default has none.
+- Have all placeholders in no result page
+- Fix pagination for pageLimit & facet search
+
+SimpleSearch 2.1.1
+========================================================================
+- Fix includeTVList bug to show normal search results as well.
+
 SimpleSearch 2.1.0
 ========================================================================
 - Added pdoParser support
@@ -52,7 +62,7 @@ SimpleSearch 1.8.0
 - Added support to ElasticSearch driver for using search fields
 - Added support to ElasticSearch driver for boosting results by a field value
 - Updated Elastica to v0.90.7.0
-- Added outputSeparator option 
+- Added outputSeparator option
 
 SimpleSearch 1.7.0
 ========================================================================

core/components/simplesearch/elements/snippets/simplesearch.snippet.php

@@ -7,10 +7,10 @@
  * @package simplesearch
  */
 require_once $modx->getOption(
-        'simplesearch.core_path',
-        null,
-        $modx->getOption('core_path') . 'components/simplesearch/'
-    ) . 'model/simplesearch/simplesearch.class.php';
+    'simplesearch.core_path',
+    null,
+    $modx->getOption('core_path') . 'components/simplesearch/'
+) . 'model/simplesearch/simplesearch.class.php';
 $search = new SimpleSearch($modx, $scriptProperties);
 
 /* Find search index and toplaceholder setting */
@@ -54,12 +54,13 @@
 $offsetIndex       = $modx->getOption('offsetIndex', $scriptProperties, 'simplesearch_offset');
 $idx               = isset($_REQUEST[$offsetIndex]) ? (int) $_REQUEST[$offsetIndex] + 1 : 1;
 $postHooks         = $modx->getOption('postHooks', $scriptProperties, '');
-$activeFacet       = $modx->getOption('facet',$_REQUEST,$modx->getOption('activeFacet', $scriptProperties, 'default'));
+$activeFacet       = $modx->getOption('facet', $_REQUEST, $modx->getOption('activeFacet', $scriptProperties, 'default'));
 $activeFacet       = $modx->sanitizeString($activeFacet);
 $facetLimit        = $modx->getOption('facetLimit', $scriptProperties, 5);
 $outputSeparator   = $modx->getOption('outputSeparator', $scriptProperties, "\n");
 $addSearchToLink   = (int) $modx->getOption('addSearchToLink', $scriptProperties, 0);
 $searchInLinkName  = $modx->getOption('searchInLinkName', $scriptProperties, 'search');
+$noResults = true;
 
 /* Get results */
 $response     = $search->getSearchResults($searchString, $scriptProperties);
@@ -87,7 +88,7 @@
                 $text = $modx->runSnippet($extractSource, $resourceArray);
             }
 
-            $extract = $search->createExtract($text,$extractLength,$extract,$extractEllipsis);
+            $extract = $search->createExtract($text, $extractLength, $extract,$extractEllipsis);
 
             /* Cleanup extract */
             $extract = strip_tags(preg_replace("#\<!--(.*?)--\>#si", '', $extract));
@@ -131,7 +132,7 @@
             foreach ($facetResults['results'] as $r) {
                 $r['idx']                           = $idx;
                 $fTpl                               = !empty($scriptProperties['tpl' . $facetKey]) ? $scriptProperties['tpl' . $facetKey] : $tpl;
-                $resultsTpl[$facetKey]['results'][] = $search->getChunk($fTpl,$r);
+                $resultsTpl[$facetKey]['results'][] = $search->getChunk($fTpl, $r);
                 $idx++;
             }
         }
@@ -141,18 +142,22 @@
 /* Set faceted results to placeholders for easy result positioning. */
 $output = array();
 foreach ($resultsTpl as $facetKey => $facetResults) {
-    $resultSet                          = implode($outputSeparator,$facetResults['results']);
+    $resultSet                          = implode($outputSeparator, $facetResults['results']);
     $placeholders[$facetKey.'.results'] = $resultSet;
     $placeholders[$facetKey.'.total']   = !empty($facetResults['total']) ? $facetResults['total'] : 0;
     $placeholders[$facetKey.'.key']     = $facetKey;
+
+    if ($placeholders[$facetKey.'.total'] !== 0) {
+        $noResults = false;
+    }
 }
 
 $placeholders['results']   = $placeholders[$activeFacet . '.results']; /* Set active facet results. */
 $placeholders['total']     = !empty($resultsTpl[$activeFacet]['total']) ? $resultsTpl[$activeFacet]['total'] : 0;
 $placeholders['page']      = isset($_REQUEST[$offsetIndex]) ? ceil((int) $_REQUEST[$offsetIndex] / $perPage) + 1 : 1;
 $placeholders['pageCount'] = !empty($resultsTpl[$activeFacet]['total']) ? ceil($resultsTpl[$activeFacet]['total'] / $perPage) : 1;
 
-if (!empty($response['results'])) {
+if (!empty($placeholders['results'])) {
     /* add results found message */
     $placeholders['resultInfo'] = $modx->lexicon('simplesearch.results_found', array(
         'count' => $placeholders['total'],
@@ -161,7 +166,7 @@
 
     /* If perPage set to >0, add paging */
     if ($perPage > 0) {
-        $placeholders['paging'] = $search->getPagination($searchString,$perPage,$pagingSeparator,$placeholders['total']);
+        $placeholders['paging'] = $search->getPagination($searchString, $perPage, $pagingSeparator, $placeholders['total']);
     }
 }
 
@@ -173,12 +178,10 @@
 $modx->setPlaceholder($placeholderPrefix . 'count', $response['total']);
 $modx->setPlaceholders($placeholders, $placeholderPrefix);
 
-if (empty($response['results'])) {
-    $output = $search->getChunk($noResultsTpl, array(
-        'query' => $searchString,
-    ));
+if ($noResults) {
+    $output = $search->getChunk($noResultsTpl, $placeholders);
 } else {
     $output = $search->getChunk($containerTpl, $placeholders);
 }
 
-return $search->output($output, $toPlaceholder);
+return $search->output($output, $toPlaceholder);

core/components/simplesearch/model/simplesearch/driver/mysql/simplesearchdriverbasic.class.php

@@ -5,6 +5,5 @@
  *
  * @package simplesearch
  */
-require_once __DIR__ . '/simplesearchdriverbasic.class.php';
-
+require_once strtr(realpath(dirname(__DIR__)), '\\', '/') . '/simplesearchdriverbasic.class.php';
 class SimpleSearchDriverBasic_mysql extends SimpleSearchDriverBasic {}

core/components/simplesearch/model/simplesearch/driver/simplesearchdriverbasic.class.php

@@ -44,17 +44,25 @@ public function search($str, array $scriptProperties = []) {
         $docFields     = explode(',', $this->modx->getOption('docFields', $scriptProperties, 'pagetitle,longtitle,alias,description,introtext,content'));
         $includeTVs    = $this->modx->getOption('includeTVs', $scriptProperties, false);
         $includeTVList = $this->modx->getOption('includeTVList', $scriptProperties, '');
+        $includedTVIds = array();
+
 
         $c = $this->modx->newQuery('modResource');
         if ($includeTVs) {
             $c->leftJoin('modTemplateVarResource', 'TemplateVarResources');
             if (!empty($includeTVList)) {
                 $includeTVList = explode(',', $includeTVList);
                 $includeTVList = array_map('trim', $includeTVList);
-                $c->leftJoin('modTemplateVar', 'TemplateVar', array('TemplateVarResources.tmplvarid = TemplateVar.id'));
-                $c->where(array(
-                    'TemplateVar.name:IN' => $includeTVList
-                ));
+                $tv = $this->modx->newQuery('modTemplateVar', [
+                    'name:IN' => $includeTVList
+                ]);
+                $tv->select('id');
+                $tv->prepare();
+                $result = $this->modx->query($tv->toSQL());
+                $tvIds = $result->fetchAll(PDO::FETCH_ASSOC);
+                foreach ($tvIds as $row) {
+                    $includedTVIds[] = $row['id'];
+                }
             }
         }
 
@@ -109,6 +117,9 @@ public function search($str, array $scriptProperties = []) {
 
                     if ($includeTVs) {
                         $whereArray[] = array('TemplateVarResources.value:LIKE', $term, xPDOQuery::SQL_OR, $whereGroup);
+                        if (!empty($includeTVList)) {
+                            $whereArray[] = array('TemplateVarResources.tmplvarid:IN', $includedTVIds, xPDOQuery::SQL_AND, $whereGroup);
+                        }
                     }
 
                     if (is_array($customPackages) && !empty($customPackages)) {
@@ -131,8 +142,12 @@ public function search($str, array $scriptProperties = []) {
                 foreach ($docFields as $field) {
                     $whereArray[] = array($field.':LIKE', $term,xPDOQuery::SQL_OR, $whereGroup);
                 }
-
-                $whereArray[] = array('TemplateVarResources.value:LIKE', $term, xPDOQuery::SQL_OR, $whereGroup);
+                if ($includeTVs) {
+                    $whereArray[] = array('TemplateVarResources.value:LIKE', $term, xPDOQuery::SQL_OR, $whereGroup);
+                    if (!empty($includeTVList)) {
+                        $whereArray[] = array('TemplateVarResources.tmplvarid:IN', $includedTVIds, xPDOQuery::SQL_AND, $whereGroup);
+                    }
+                }
                 if (is_array($customPackages) && !empty($customPackages)) {
                     foreach ($customPackages as $package) {
                         $fields = explode(',', $package[1]);