Integration 2 (#14)

* FIX: Make null fields empty string, otherwise manticoresearch breaks

* FIX: Ensure all fields are converted back to CamelCase

* FIX: Stored fields now a thang

* FIX: Filter highlighted fields

* FIX: Coding standards, debug deletion

* ENHANCEMENT: Multi fields now indexed

* ENHANCEMENT: bigram indexing

* FIX: Has many fields

* WIP: Method name changes

src/Service/BulkIndexer.php

@@ -11,7 +11,6 @@
 
 use SilverStripe\ORM\DataObject;
 use Suilven\FreeTextSearch\Factory\IndexerFactory;
-use Suilven\FreeTextSearch\Helper\IndexingHelper;
 
 /**
  * Class BulkIndexer
@@ -46,8 +45,6 @@ public function setIndex(string $newIndex): void
      */
     public function addDataObject(DataObject $dataObject): void
     {
-        $helper = new IndexingHelper();
-
         $factory = new IndexerFactory();
         $indexer = $factory->getIndexer();
         $indexer->setIndexName($this->index);

src/Service/IndexCreator.php

@@ -33,6 +33,10 @@ public function createIndex(string $indexName): void
 
         $columns = [];
         foreach ($fields as $field) {
+            if ($field === 'Link') {
+                continue;
+            }
+
             $fieldType = $specs[$field];
 
             // this will be the most common
@@ -86,6 +90,7 @@ public function createIndex(string $indexName): void
         $indexes = new Indexes();
         $index = $indexes->getIndex($indexName);
         $mvaFields = $index->getHasManyFields();
+
         error_log(print_r($mvaFields, true));
 
         foreach(array_keys($mvaFields) as $mvaColumnName) {
@@ -100,7 +105,7 @@ public function createIndex(string $indexName): void
             'dict' => 'keywords',
             'min_infix_len' => 2,
             'html_strip' => 1,
-            'bigram_index' => 'both_freq'
+            'bigram_index' => 'all',
         ];
 
 

src/Service/Searcher.php

@@ -59,7 +59,7 @@ public function search(?string $q): SearchResults
 
 
         $hasManyFields = $index->getHasManyFields();
-        foreach(array_keys($hasManyFields) as $key) {
+        foreach (\array_keys($hasManyFields) as $key) {
             $allFields[] = $key;
         }
 

tests/Service/SearchTest.php

@@ -92,10 +92,9 @@ public function testIndexOneDocumentAndSearch(): void
         $doc = DataObject::get_by_id(\Page::class, self::$pageID);
         $factory = new IndexerFactory();
         $indexer = $factory->getIndexer();
-        $indexer->setIndex('sitetree');
+        $indexer->setIndexName('sitetree');
         $indexer->index($doc);
 
-
         $searcher = new Searcher();
         $searcher->setIndexName('sitetree');