wip #4666 @1

diff --git a/app/Jobs/ProcessFluidbook.php b/app/Jobs/ProcessFluidbook.php
index 3e53a691b48bd7f88c219b28b5ef6d52f7cc1304..a870bc491510515c04b6ceeccbb6069d27b81607 100644 (file)
--- a/app/Jobs/ProcessFluidbook.php
+++ b/app/Jobs/ProcessFluidbook.php
@@ -9,6 +9,7 @@ use Cubist\Util\PHP;
 use Fluidbook\Tools\FluidbookTools;
 use Fluidbook\Tools\Jobs\ProcessFile;
 use Fluidbook\Tools\PDF\Document;
+use Fluidbook\Tools\Search\SearchIndex;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -113,8 +114,8 @@ class ProcessFluidbook implements ShouldQueue, ShouldBeUnique
     {
         $cp = $this->getConvertPath();
         for ($i = 1; $i <= $this->in->getPages(); $i++) {
-            $this->vdir->copy($cp . 'html/t-' . $i . '.-150.jpg', 'data/background/150/t' . $i . '.jpg');
-            $this->vdir->copy($cp . 'html/to-' . $i . '.svg', 'data/contents/p' . $i . '.svg');
+            $this->vdir->copy($cp . 'html/t' . $i . '-150.jpg', 'data/background/150/t' . $i . '.jpg');
+            $this->vdir->copy($cp . 'html/to' . $i . '.svg', 'data/contents/p' . $i . '.svg');
             $this->vdir->copy($cp . 'html/p' . $i . '.jpg', 'data/thumbnails/p' . $i . '.jpg');
         }
     }
@@ -126,7 +127,13 @@ class ProcessFluidbook implements ShouldQueue, ShouldBeUnique
 
     public function compileSearch()
     {
+        $index = new SearchIndex();
+        for ($i = 1; $i <= $this->in->getPages(); $i++) {
+            $index->addPage($i, $i, $this->getConvertPath() . 'texts');
+        }
 
+        $this->vdir->file_put_contents('data/search.highlight.js', 'var HIGHLIGHTS=' . json_encode($index->compileHighlights()) . ';');
+        $this->vdir->file_put_contents('data/search.index.js', 'var INDEX=' . json_encode($index->compileIndex()) . ';');
     }
 
     public function compileConfig()

diff --git a/composer.lock b/composer.lock
index bea22f73c4a8f644b09c8e7748cceedc5b3322b3..f956c3f4375be57fcab58494cda34507ba033a40 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -288,16 +288,16 @@
         },
         {
             "name": "backpack/permissionmanager",
-            "version": "6.0.9",
+            "version": "6.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Laravel-Backpack/PermissionManager.git",
-                "reference": "b605c2ce298e18c1443c47f6bbdfdf98b7e645b2"
+                "reference": "0878f0c11ec00fca376c124c926dd6b840b3eb80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Laravel-Backpack/PermissionManager/zipball/b605c2ce298e18c1443c47f6bbdfdf98b7e645b2",
-                "reference": "b605c2ce298e18c1443c47f6bbdfdf98b7e645b2",
+                "url": "https://api.github.com/repos/Laravel-Backpack/PermissionManager/zipball/0878f0c11ec00fca376c124c926dd6b840b3eb80",
+                "reference": "0878f0c11ec00fca376c124c926dd6b840b3eb80",
                 "shasum": ""
             },
             "require": {
@@ -359,9 +359,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Laravel-Backpack/PermissionManager/issues",
-                "source": "https://github.com/Laravel-Backpack/PermissionManager/tree/6.0.9"
+                "source": "https://github.com/Laravel-Backpack/PermissionManager/tree/6.0.10"
             },
-            "time": "2021-05-24T14:20:57+00:00"
+            "time": "2021-09-14T08:00:54+00:00"
         },
         {
             "name": "backpack/revise-operation",
@@ -1486,13 +1486,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "68279da429ce0b6b7488797541eab9766756910e"
+                "reference": "625020133b3199d9dacf967225e97deba625a5c5"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-655975.tar",
-                "reference": "68279da429ce0b6b7488797541eab9766756910e",
-                "shasum": "52ae14dbe977ac8e58a9803a5830bc955be5e6f7"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-788531.tar",
+                "reference": "625020133b3199d9dacf967225e97deba625a5c5",
+                "shasum": "c86716eaf424939aef3bccbc77f6dfd43d210d12"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -1522,7 +1522,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2021-09-13T15:58:30+00:00"
+            "time": "2021-09-13T17:11:49+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
@@ -2612,13 +2612,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "e4d1738be232282a488c1a50ffd10d1a7cdb0211"
+                "reference": "cee9cbc8c5c8756448b7e6c9d42865d16c2266e8"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-2d42a0.tar",
-                "reference": "e4d1738be232282a488c1a50ffd10d1a7cdb0211",
-                "shasum": "8b01a492d6c5f8819c7bb834969034c8407e10e6"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-dfaf55.tar",
+                "reference": "cee9cbc8c5c8756448b7e6c9d42865d16c2266e8",
+                "shasum": "204142ce1cff1965fab050bf29165db2544c5875"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "^3.6",
@@ -2650,7 +2650,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2021-09-13T15:58:41+00:00"
+            "time": "2021-09-14T12:38:18+00:00"
         },
         {
             "name": "fruitcake/laravel-cors",