Made search more efficient and tweaked weighting

Added per-entity weighting changes.
Now Books score higher than chapters which score higher than pages.

Reduced queries required on search by only searching once but at a
higher count to see if there's another page.

diff --git a/app/Book.php b/app/Book.php
index 457a4c928ac5b6f08bdea84f1e13cace325fe338..51ea226b47cda9b9df027e922db2d4e1dc6995a2 100644 (file)
--- a/app/Book.php
+++ b/app/Book.php
@@ -2,6 +2,7 @@
 
 class Book extends Entity
 {
 
 class Book extends Entity
 {

+    public $searchFactor = 2;

 
     protected $fillable = ['name', 'description', 'image_id'];
 
 
     protected $fillable = ['name', 'description', 'image_id'];
 

diff --git a/app/Chapter.php b/app/Chapter.php
index 6dab9dc47c2dda2588d5d38f83a33169d70006a4..3726c57f4e3df340c49cce79f29c8624ec4485c3 100644 (file)
--- a/app/Chapter.php
+++ b/app/Chapter.php
@@ -2,6 +2,8 @@
 
 class Chapter extends Entity
 {
 
 class Chapter extends Entity
 {

+    public $searchFactor = 1.3;
+

     protected $fillable = ['name', 'description', 'priority', 'book_id'];
 
     protected $with = ['book'];
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
 
     protected $with = ['book'];

diff --git a/app/Entity.php b/app/Entity.php
index 1ea4e8dac57cc56e8b978b11ca94f7850d914142..aeeab4960444df6682ae11fec14c4da6a271b845 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -5,8 +5,16 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 class Entity extends Ownable
 {
 
 class Entity extends Ownable
 {
 

+    /**
+     * @var string - Name of property where the main text content is found
+     */

     public $textField = 'description';
 
     public $textField = 'description';
 

+    /**
+     * @var float - Multiplier for search indexing.
+     */
+    public $searchFactor = 1.0;
+

     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.
     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.


@@ -193,4 +201,5 @@ class Entity extends Ownable
     {
         return '/';
     }
     {
         return '/';
     }

+

 }
 }

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 0827eeb7196624fb77e0800cbdcc15c76979ec7d..ddc92f7055cb97570cfca5ce74b0398ac461d18a 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -40,13 +40,12 @@ class SearchController extends Controller
         $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
         $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);

-        $hasNextPage = $this->searchService->searchEntities($searchTerm, 'all', $page+1, 20)['count'] > 0;

 
         return view('search/all', [
             'entities'   => $results['results'],
             'totalResults' => $results['total'],
             'searchTerm' => $searchTerm,
 
         return view('search/all', [
             'entities'   => $results['results'],
             'totalResults' => $results['total'],
             'searchTerm' => $searchTerm,

-            'hasNextPage' => $hasNextPage,
+            'hasNextPage' => $results['has_more'],

             'nextPageLink' => $nextPageLink
         ]);
     }
             'nextPageLink' => $nextPageLink
         ]);
     }

diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php
index 6786c5cf498707a8691cc7292b632cf909f800fd..cb445eed1e5242fa3cc1d1ff92740e9efb13a21d 100644 (file)
--- a/app/Services/SearchService.php
+++ b/app/Services/SearchService.php
@@ -72,7 +72,6 @@ class SearchService
         $terms = $this->parseSearchString($searchString);
         $entityTypes = array_keys($this->entities);
         $entityTypesToSearch = $entityTypes;
         $terms = $this->parseSearchString($searchString);
         $entityTypes = array_keys($this->entities);
         $entityTypesToSearch = $entityTypes;

-        $results = collect();

 
         if ($entityType !== 'all') {
             $entityTypesToSearch = $entityType;
 
         if ($entityType !== 'all') {
             $entityTypesToSearch = $entityType;


@@ -80,21 +79,23 @@ class SearchService
             $entityTypesToSearch = explode('|', $terms['filters']['type']);
         }
 
             $entityTypesToSearch = explode('|', $terms['filters']['type']);
         }
 

+        $results = collect();

         $total = 0;
 
         foreach ($entityTypesToSearch as $entityType) {
             if (!in_array($entityType, $entityTypes)) {
                 continue;
             }
         $total = 0;
 
         foreach ($entityTypesToSearch as $entityType) {
             if (!in_array($entityType, $entityTypes)) {
                 continue;
             }

-            $search = $this->searchEntityTable($terms, $entityType, $page, $count);
-            $total += $this->searchEntityTable($terms, $entityType, $page, $count, true);
+            $search = $this->searchEntityTable($terms, $entityType, $page, $count + 1);
+            $total += $this->searchEntityTable($terms, $entityType, $page, $count + 1, true);

             $results = $results->merge($search);
         }
 
         return [
             'total' => $total,
             'count' => count($results),
             $results = $results->merge($search);
         }
 
         return [
             'total' => $total,
             'count' => count($results),

-            'results' => $results->sortByDesc('score')->values()
+            'has_more' => $results->count() > $count,
+            'results' => $results->sortByDesc('score')->slice(0, $count)->values()

         ];
     }
 
         ];
     }
 


@@ -322,8 +323,8 @@ class SearchService
     public function indexEntity(Entity $entity)
     {
         $this->deleteEntityTerms($entity);
     public function indexEntity(Entity $entity)
     {
         $this->deleteEntityTerms($entity);

-        $nameTerms = $this->generateTermArrayFromText($entity->name, 5);
-        $bodyTerms = $this->generateTermArrayFromText($entity->getText(), 1);
+        $nameTerms = $this->generateTermArrayFromText($entity->name, 5 * $entity->searchFactor);
+        $bodyTerms = $this->generateTermArrayFromText($entity->getText(), 1 * $entity->searchFactor);

         $terms = array_merge($nameTerms, $bodyTerms);
         foreach ($terms as $index => $term) {
             $terms[$index]['entity_type'] = $entity->getMorphClass();
         $terms = array_merge($nameTerms, $bodyTerms);
         foreach ($terms as $index => $term) {
             $terms[$index]['entity_type'] = $entity->getMorphClass();


@@ -340,8 +341,8 @@ class SearchService
     {
         $terms = [];
         foreach ($entities as $entity) {
     {
         $terms = [];
         foreach ($entities as $entity) {

-            $nameTerms = $this->generateTermArrayFromText($entity->name, 5);
-            $bodyTerms = $this->generateTermArrayFromText($entity->getText(), 1);
+            $nameTerms = $this->generateTermArrayFromText($entity->name, 5 * $entity->searchFactor);
+            $bodyTerms = $this->generateTermArrayFromText($entity->getText(), 1 * $entity->searchFactor);

             foreach (array_merge($nameTerms, $bodyTerms) as $term) {
                 $term['entity_id'] = $entity->id;
                 $term['entity_type'] = $entity->getMorphClass();
             foreach (array_merge($nameTerms, $bodyTerms) as $term) {
                 $term['entity_id'] = $entity->id;
                 $term['entity_type'] = $entity->getMorphClass();