Release/1.2.3/dev build search fix

_config/config.yml

@@ -0,0 +1,7 @@
+---
+Name: Search Module dev/build
+---
+SilverStripe\ORM\DatabaseAdmin:
+  extensions:
+    - Werkbot\Search\DatabaseAdminExtension
+

src/DatabaseAdminExtension.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Werkbot\Search;
+
+use SilverStripe\Control\Controller;
+use SilverStripe\ORM\DataExtension;
+
+class DatabaseAdminExtension extends DataExtension
+{
+  public function onAfterBuild()
+  {
+    (new SearchIndex())->run(Controller::curr()->getRequest());
+  }
+}
+

src/SearchControllerExtension.php

@@ -2,20 +2,20 @@
 
 namespace Werkbot\Search;
 
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\CMS\Search\SearchForm;
+use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\FormAction;
+use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\TextField;
+use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataExtension;
+use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\PaginatedList;
-use Werkbot\Search\TNTSearchHelper;
-use SilverStripe\Control\HTTPRequest;
-use SilverStripe\Forms\RequiredFields;
 use SilverStripe\ORM\ValidationResult;
-use SilverStripe\CMS\Search\SearchForm;
-use SilverStripe\ORM\FieldType\DBField;
 use TeamTNT\TNTSearch\Exceptions\IndexNotFoundException;
+use Werkbot\Search\TNTSearchHelper;
 
 class SearchControllerExtension extends DataExtension
 {
@@ -77,24 +77,11 @@ public function SiteSearchFormResults($searchdata, $form)
 
       if (isset($searchdata['Search'])) {
           try {
-              $tnt = TNTSearchHelper::Instance()->getTNTSearch();
-              $tnt->selectIndex('site.index');
-              $res = $tnt->search($searchdata['Search']);
-              $classlist = [];
-              $classes = ClassInfo::classesWithExtension(SearchableExtension::class);
-              foreach ($classes as $key => $value) {
-                  $classlist[ClassInfo::shortName($value)] = $value;
-              }
-              foreach ($res["ids"] as $result) {
-                  $parts = explode("_", $result);
-                  if ($obj = $classlist[$parts[0]]::get()->byID($parts[1])) {
-                      $Results->push($obj);
-                  }
-              }
+            $Results = $this->getSearchResults($searchdata['Search']);
           } catch (IndexNotFoundException $e) {
-              $validationResult = new ValidationResult();
-              $validationResult->addFieldError('Message', 'Search index not found');
-              $form->setSessionValidationResult($validationResult);
+            $validationResult = new ValidationResult();
+            $validationResult->addFieldError('Message', 'Search index not found');
+            $form->setSessionValidationResult($validationResult);
           }
 
           if ($this->owner->config()->get('save_search_queries')) {
@@ -119,4 +106,36 @@ public function SiteSearchFormResults($searchdata, $form)
       );
       return $this->owner->customise($data)->renderWith(array('SearchableResultsPage', 'Page'));
   }
+
+  /**
+   * Get search results
+   *
+   * @param string $search
+   * @return ArrayList
+   **/
+  public function getSearchResults(string $search)
+  {
+    $results = ArrayList::create();
+
+    $tnt = TNTSearchHelper::Instance()->getTNTSearch();
+    $tnt->selectIndex('site.index');
+    $res = $tnt->search($search);
+
+    $classlist = [];
+    $classes = ClassInfo::classesWithExtension(SearchableExtension::class);
+    foreach ($classes as $key => $value) {
+        $classlist[ClassInfo::shortName($value)] = $value;
+    }
+
+    foreach ($res['ids'] as $result) {
+        $parts = explode("_", $result);
+        if ($obj = $classlist[$parts[0]]::get()->byID($parts[1])) {
+            $results->push($obj);
+        }
+    }
+
+    return $results;
+  }
+
 }
+

src/SearchableExtension.php

@@ -1,12 +1,11 @@
 <?php
-/**/
+
 namespace Werkbot\Search;
-/**/
-use SilverStripe\ORM\DB;
+
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\Versioned\Versioned;
-/**/
+
 class SearchableExtension extends DataExtension
 {
   /*
@@ -15,7 +14,7 @@ class SearchableExtension extends DataExtension
   */
   public $SearchableExtension_Title_ColumnName = "Title";
   public $SearchableExtension_Summary_ColumnName = "Content";
-  /**/
+
   private static $casting = [
     "getSearchableTitle" => "Text",
     "getSearchableSummary" => 'HTMLText',
@@ -223,23 +222,5 @@ public function onAfterDelete()
   {
       $this->owner->deleteIndex();
   }
-  /**
-   * requireDefaultRecords
-   * Runs the index on a dev/build
-  **/
-  public function requireDefaultRecords()
-  {
-      parent::requireDefaultRecords();
-
-      if (!file_exists(dirname(__DIR__, 4).'/search')) {
-          mkdir(dirname(__DIR__, 4).'/search');
-          echo "Created search folder<br /><br />";
-      }
-      $indexer = TNTSearchHelper::Instance()->getTNTSearchIndex(true);
-      if ($query = $this->owner->getIndexQuery()) {
-          $indexer->query($query);
-          $indexer->run();
-          DB::alteration_message('Indexing...'.$this->owner->ClassName, 'created');
-      }
-  }
 }
+

src/Tasks/SearchIndex.php

@@ -1,34 +1,34 @@
 <?php
-/**/
+
 namespace Werkbot\Search;
-/**/
-use SilverStripe\Dev\BuildTask;
+
 use SilverStripe\Core\ClassInfo;
+use SilverStripe\Dev\BuildTask;
+use SilverStripe\ORM\DB;
 use Werkbot\Search\TNTSearchHelper;
-/**/
+
 class SearchIndex extends BuildTask
 {
-  /**/
   protected $title = "Search Index";
   protected $description = "";
   protected $enabled = true;
-  /**/
+
   public function run($request)
   {
-      if (!file_exists(dirname(__DIR__, 5).'/search')) {
-          mkdir(dirname(__DIR__, 5).'/search');
-          echo "Created search folder<br /><br />";
-      }
-      $indexer = TNTSearchHelper::Instance()->getTNTSearchIndex(true);
-      $classes = ClassInfo::classesWithExtension(SearchableExtension::class);
-      foreach ($classes as $Title => $ClassName) {
-          $searchableClass = singleton($ClassName);
-          if ($query = $searchableClass->getIndexQuery()) {
-              echo "Indexing...$ClassName<br />";
-              $indexer->query($query);
-              $indexer->run();
-              echo "<br /><br />";
-          }
+    if (!file_exists(dirname(__DIR__, 5) . '/search')) {
+      mkdir(dirname(__DIR__, 5) . '/search');
+      echo "Created search folder<br /><br />";
+    }
+    $indexer = TNTSearchHelper::Instance()->getTNTSearchIndex(true);
+    $classes = ClassInfo::classesWithExtension(SearchableExtension::class);
+    foreach ($classes as $title => $className) {
+      $searchableClass = singleton($className);
+      if ($query = $searchableClass->getIndexQuery()) {
+        $indexer->query($query);
+        $indexer->run();
+        DB::alteration_message('Indexing...' . $className, 'created');
       }
+    }
   }
 }
+