Merge pull request #1744 from visuddhinanda/laravel

没有查到书号返回0

app/Console/Commands/TestSearchPali.php

@@ -43,14 +43,14 @@ class TestSearchPali extends Command
         if($result){
             $this->info("word={$word} total=".$result['total']);
         }else{
-            $this->error('word={$word} search fail');
+            $this->error("word={$word} search fail");
         }
 
         $result = PaliSearch::search([$word],[267],'case',0,3);
         if($result){
             $this->info("word={$word} book=267 total=".$result['total']);
         }else{
-            $this->error('word={$word} book=267 search fail');
+            $this->error("word={$word} book=267 search fail");
         }
 
         return 0;

app/Http/Resources/SearchBookResource.php

@@ -18,19 +18,21 @@ class SearchBookResource extends JsonResource
     public function toArray($request)
     {
         $book = BookTitle::where('sn',$this->pcd_book_id)->first();
+        $data = [
+            'pcdBookId'=>$this->pcd_book_id,
+            "count"=>$this->co,
+        ];
         if($book){
             $toc = PaliText::where('book',$book->book)->where("paragraph",$book->paragraph)->value('toc');
-            return [
-                "book"=>$book->book,
-                "paragraph"=> $book->paragraph,
-                "paliTitle"=> $toc,
-                'pcdBookId'=>$this->pcd_book_id,
-                "count"=>$this->co,
-            ];
+            $data["book"] = $book->book;
+            $data["paragraph"] = $book->paragraph;
+            $data["paliTitle"] = $toc;
         }else{
-            Log::error('book title is null');
-            Log::error(json_encode($this));
+            Log::error('book title is null pcd_book_id='.$this->pcd_book_id);
+            $data["book"] = 0;
+            $data["paragraph"] = 0;
+            $data["paliTitle"] = '';
         }
-
+        return $data;
     }
 }

app/Tools/Markdown.php

@@ -21,14 +21,15 @@ class Markdown
     }
 
     public static function morus($text){
+
         if(isset($GLOBALS['morus_client'])){
             $client = $GLOBALS['morus_client'];
         }else{
             $host = config('mint.server.rpc.morus.host') . ':'. config('mint.server.rpc.morus.port');
             Log::debug('morus host='.$host);
             $client = new \Mint\Morus\V1\MarkdownClient($host, [
-                'credentials' => \Grpc\ChannelCredentials::createInsecure(),
-            ]);
+                    'credentials' => \Grpc\ChannelCredentials::createInsecure(),
+                ]);
             $GLOBALS['morus_client'] = $client;
         }