Merge branch 'laravel' of github.com:visuddhinanda/mint into laravel

app/Console/Commands/UpgradeWbwParaNum.php

@@ -92,12 +92,15 @@ class UpgradeWbwParaNum extends Command
                             $bookName = mb_substr($bookCode,0,$dot+1,'UTF-8');
                             $paraNum = mb_substr($bookCode,$dot+1,null,'UTF-8').$row->word;
                         }
+                        $bookName = mb_strtolower(mb_substr($bookName,0,64,'UTF-8'),'UTF-8');
                         $bookCodeStack[$bookName] = 1;
-                        WbwTemplate::where('id',$row->id)->update([
-                            'type'=>':cs.para:',
-                            'gramma'=>mb_strtolower(mb_substr($bookName,0,64,'UTF-8'),'UTF-8'),
-                            'part'=>$paraNum,
-                        ]);
+                        if(!empty($bookName)){
+                            WbwTemplate::where('id',$row->id)->update([
+                                'type'=>':cs.para:',
+                                'gramma'=>$bookName,
+                                'part'=>$paraNum,
+                            ]);
+                        }
                         $count++;
                     }else if($row->word===';'){
                         $bookCode = '';

app/Http/Controllers/ChannelController.php

@@ -440,11 +440,21 @@ class ChannelController extends Controller
                     $finalTable = Sentence::whereIns(['book_id','paragraph','word_start','word_end'],$query)
                                             ->where('channel_uid',$currChannelId)
                                             ->where('strlen','>',0)
-                                            ->select(['strlen','book_id','paragraph','word_start','word_end']);
+                                            ->select(['strlen','book_id','paragraph','word_start','word_end','created_at','updated_at']);
+                    $created_at = time();
+                    $edit_at = 0;
                     if($finalTable->count()>0){
                         $finished = $finalTable->get();
                         $currChannel = [];
                         foreach ($finished as $rowFinish) {
+                            $createTime = strtotime($rowFinish->created_at);
+                            $updateTime = strtotime($rowFinish->updated_at);
+                            if($createTime < $created_at){
+                                $created_at = $createTime;
+                            }
+                            if($updateTime > $edit_at){
+                                $edit_at = $updateTime;
+                            }
                             $currChannel["{$rowFinish->book_id}-{$rowFinish->paragraph}-{$rowFinish->word_start}-{$rowFinish->word_end}"] = 1;
                         }
                         $final=[];
@@ -457,6 +467,8 @@ class ChannelController extends Controller
                             }
                         }
                         $result[$key]['final'] = $final;
+                        $result[$key]['content_created_at'] = date('Y-m-d H:i:s',$created_at);
+                        $result[$key]['content_updated_at'] = date('Y-m-d H:i:s',$edit_at);
                     }
                 }
             }

app/Http/Controllers/NavCSParaController.php

@@ -39,7 +39,7 @@ class NavCSParaController extends Controller
      */
     public function show(string $paraNumber)
     {
-        //99-5-37
+        //99_5_37-38
         $id = explode('_',$paraNumber);
         if(count($id) !== 3){
             return $this->error('参数错误。参数应为3 实际得到'.count($id),400,400);
@@ -51,21 +51,30 @@ class NavCSParaController extends Controller
         if(!$para){
             return $this->error('没有找到段落起始'.$id,404,404);
         }
+        //cs 段落号列表
+        $csPara = explode('-',$id[2]);
+        $csList = [];
+        for ($i=(int)$csPara[0]; $i <=(int)end($csPara) ; $i++) {
+            $csList[] = $i;
+        }
+        //段落区间
         $begin = $id[1];
         $end = (int)$id[1] + $para->chapter_len;
         $curr = WbwTemplate::where('book',$id[0])
                                 ->where('style','paranum')
-                                ->where('word',$id[2])
+                                ->whereIn('word',$csList)
                                 ->whereBetween('paragraph',[$begin,$end])
-                                ->select('book','paragraph')->first();
+                                ->orderBy('paragraph')
+                                ->select('book','paragraph')->get();
         if(!$curr){
             return $this->error('没有找到段落'.$id,404,404);
         }
+
         $data = [];
-        $data['curr'] = new NavCSParaResource($curr);
+        $data['curr'] = new NavCSParaResource($curr[0]);
         $next = WbwTemplate::where('book',$id[0])
                 ->where('style','paranum')
-                ->where('word',(int)$id[2]+1)
+                ->where('word',(int)end($csPara)+1)
                 ->whereBetween('paragraph',[$begin,$end])
                 ->select('book','paragraph')->first();
         if($next){
@@ -76,7 +85,7 @@ class NavCSParaController extends Controller
         }
         $prev = WbwTemplate::where('book',$id[0])
                             ->where('style','paranum')
-                            ->where('word',$id[2]-1)
+                            ->where('word',(int)$csPara[0]-1)
                             ->whereBetween('paragraph',[$begin,$end])
                             ->select('book','paragraph')->first();
         if($prev){

app/Tools/PaliSearch.php

@@ -32,6 +32,7 @@ class PaliSearch
         }
         $output = [];
         $output['total'] = $response->getTotal();
+        $output['page'] = $response->getPage();
         $output['rows'] = [];
         foreach ($response->getItems() as $key => $value) {
             $output['rows'][] = (object)[

public/pali_title/151_pali.csv

@@ -3,7 +3,7 @@ NULL,p151,1,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p151,2,100,nikaya,,Khuddakanikāye
 NULL,p151,3,1,book,Paṭisambhidāmaggapāḷi,Paṭisambhidāmaggapāḷi
 NULL,p151,4,2,chapter,"1. Mahāvaggo","1. Mahāvaggo"
-NULL,p151,5,4,subhead,Mātikā,Mātikā
+NULL,p151,5,3,subhead,Mātikā,Mātikā
 NULL,p151,6,100,bodytext,,"1. Sotāvadhāne  paññā sutamaye ñāṇaṃ."
 NULL,p151,7,100,bodytext,,"2. Sutvāna saṃvare paññā sīlamaye ñāṇaṃ."
 NULL,p151,8,100,bodytext,,"3. Saṃvaritvā samādahane paññā samādhibhāvanāmaye ñāṇaṃ."