Merge pull request #1740 from visuddhinanda/laravel

bug修复,wbw无法提交

app/Console/Commands/UpgradeWbwTemplate.php

@@ -13,7 +13,7 @@ class UpgradeWbwTemplate extends Command
 {
     /**
      * The name and signature of the console command.
-     *
+     * php artisan upgrade:wbw.template 107
      * @var string
      */
     protected $signature = 'upgrade:wbw.template {book?} {para?}';

app/Http/Controllers/CorpusController.php

@@ -663,7 +663,7 @@ class CorpusController extends Controller
                             // 传过来的数据一定有一个原文channel
                             //
                             if($mode !== "read"){
-                                if($info->content_type==='json'){
+                                if($row->content_type==='json'){
                                     $newSent['channel']['type'] = "wbw";
                                     if(isset($this->wbwChannels[0])){
                                         $newSent['channel']['name'] = $indexChannel[$this->wbwChannels[0]]->name;

app/Http/Controllers/NavPageController.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\PageNumber;
+use Illuminate\Http\Request;
+use App\Http\Resources\NavPageResource;
+
+class NavPageController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  string  $pageNumber
+     * @return \Illuminate\Http\Response
+     */
+    public function show(string $pageNumber)
+    {
+        //1-M-1-37
+        $id = explode('-',$pageNumber);
+        if(count($id) !== 4){
+            return $this->error('参数错误。参数应为4 实际得到'.count($id),400,400);
+        }
+        $pageCurr = PageNumber::where('book',$id[0])
+                            ->where('type',$id[1])
+                            ->where('volume',$id[2])
+                            ->where('page',$id[3])
+                            ->first();
+        $pagePrev = PageNumber::where('book',$id[0])
+                            ->where('type',$id[1])
+                            ->where('volume',$id[2])
+                            ->where('page',(int)$id[3]-1)
+                            ->first();
+        $pageNext = PageNumber::where('book',$id[0])
+                            ->where('type',$id[1])
+                            ->where('volume',$id[2])
+                            ->where('page',(int)$id[3]+1)
+                            ->first();
+        return $this->ok([
+            'curr'=>$pageCurr? new NavPageResource($pageCurr):null,
+            'prev'=>$pagePrev? new NavPageResource($pagePrev):null,
+            'next'=>$pageNext? new NavPageResource($pageNext):null,
+        ]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Models\PageNumber  $pageNumber
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, PageNumber $pageNumber)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\PageNumber  $pageNumber
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(PageNumber $pageNumber)
+    {
+        //
+    }
+}

app/Http/Resources/NavPageResource.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class NavPageResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}

public/pali_title/pali_serieses.csv

@@ -1,4 +1,4 @@
-"id","book","paragraph","title"
+id,book,paragraph,title
 1,1,2,namakkārapāḷi
 2,1,159,namakkāraṭīkā
 3,2,2,mahāpaṇāmapāṭha
@@ -21,7 +21,7 @@
 20,15,2,saddanītippakaraṇaṃ (padamālā)
 21,16,2,saddanītippakaraṇaṃ (dhātumālā)
 22,17,2,padarūpasiddhi
-23,18,2,moggallāna pañcikā ṭīkā
+23,18,2,moggallāna-pañcikā-ṭīkā
 24,19,2,payogasiddhipāḷi
 25,20,2,vuttodayaṃ
 26,21,2,abhidhānappadīpikā
@@ -57,10 +57,10 @@
 56,50,1,kaccāyana  dhātu mañjūsā
 57,51,1,samantakūṭavaṇṇanā
 58,52,1,moggallāna vuttivivaraṇapañcikā.
-59,53,1,thupavaṃso
-60,54,1,dāṭhāvaṃso
+59,53,1,thupavaṃsa
+60,54,1,dāṭhāvaṃsa
 61,55,1,dhātupāṭha  vilāsiniyā
-62,56,1,dhātuvaṃso
+62,56,1,dhātuvaṃsa
 63,57,1,hatthavanagallavihāra  vaṃso
 64,58,1,jinacaritaya
 65,59,1,jinavaṃsadīpaṃ
@@ -68,8 +68,8 @@
 67,61,2,cūḷaganthavaṃsapāḷi
 68,62,2,sāsanavaṃsappadīpikā
 69,63,2,mahāvaṃsapāḷi
-70,64,2,visuddhimaggo
-71,65,2,visuddhimaggo
+70,64,2,visuddhimagga
+71,65,2,visuddhimagga
 72,66,2,visuddhimagga-mahāṭīkā
 73,67,2,visuddhimagga-mahāṭīkā
 74,68,2,visuddhimagga nidānakathā
@@ -189,20 +189,20 @@
 188,169,3,saṃyuttanikāyapāḷi
 189,170,3,saṃyuttanikāyapāḷi
 190,171,3,saṃyuttanikāyapāḷi
-191,172,3,dhammasaṅgaṇī-mūlaṭīkā
-192,173,3,vibhaṅga-mūlaṭīkā
-193,173,1155,vibhaṅga-anuṭīkā
-194,174,4,dhātukathāpakaraṇa-mūlaṭīkā
-195,174,100,puggalapaññattipakaraṇa-mūlaṭīkā
-196,174,201,kathāvatthupakaraṇa-mūlaṭīkā
-197,174,865,yamakapakaraṇa-mūlaṭīkā
-198,174,1059,paṭṭhānapakaraṇa-mūlaṭīkā
-199,175,3,dhammasaṅgaṇī-anuṭīkā
-200,176,4,dhātukathāpakaraṇa-anuṭīkā
-201,176,117,puggalapaññattipakaraṇa-anuṭīkā
-202,176,213,kathāvatthupakaraṇa-anuṭīkā
-203,176,917,yamakapakaraṇa-anuṭīkā
-204,176,1139,paṭṭhānapakaraṇa-anuṭīkā
+191,172,3,mūlaṭīkā
+192,173,3,mūlaṭīkā
+193,173,1155,anuṭīkā
+194,174,4,mūlaṭīkā
+195,174,100,mūlaṭīkā
+196,174,201,mūlaṭīkā
+197,174,865,mūlaṭīkā
+198,174,1059,mūlaṭīkā
+199,175,3,anuṭīkā
+200,176,4,anuṭīkā
+201,176,117,anuṭīkā
+202,176,213,anuṭīkā
+203,176,917,anuṭīkā
+204,176,1139,anuṭīkā
 205,177,2,abhidhammāvatāro
 206,177,4805,nāmarūpaparicchedo
 207,177,10627,paramatthavinicchayo
@@ -255,9 +255,9 @@
 254,206,717,sāratthadīpanī-ṭīkā
 255,206,1753,sāratthadīpanī-ṭīkā
 256,206,2154,sāratthadīpanī-ṭīkā
-257,207,3,bhikkhupātimokkhapāḷi
-258,207,524,bhikkhunīpātimokkhapāḷi
-259,207,1215,kaṅkhāvitaraṇī-aṭṭhakathā
+257,207,3,pātimokkhapāḷi
+258,207,524,pātimokkhapāḷi
+259,207,1215,kaṅkhāvitaraṇī
 260,208,3,vinayasaṅgaha-aṭṭhakathā
 261,209,3,vajirabuddhi-ṭīkā
 262,209,166,vajirabuddhi-ṭīkā
@@ -265,18 +265,18 @@
 264,209,1708,vajirabuddhi-ṭīkā
 265,209,2217,vajirabuddhi-ṭīkā
 266,209,2428,vajirabuddhi-ṭīkā
-267,210,3,Vimativinodanī-ṭīkā
-268,210,1658,Vimativinodanī-ṭīkā
-269,210,1779,Vimativinodanī-ṭīkā
-270,210,2431,Vimativinodanī-ṭīkā
-271,210,2792,Vimativinodanī-ṭīkā
+267,210,3,vimativinodanī-ṭīkā
+268,210,1658,vimativinodanī-ṭīkā
+269,210,1779,vimativinodanī-ṭīkā
+270,210,2431,vimativinodanī-ṭīkā
+271,210,2792,vimativinodanī-ṭīkā
 272,211,3,vinayālaṅkāra-ṭīkā
 273,212,2,kaṅkhāvitaraṇī
 274,212,671,kaṅkhāvitaraṇī
-275,213,3,(vn)pārājikapāḷi
-276,214,3,(vn)pācittiyapāḷi
-277,215,3,(vn)mahāvaggapāḷi
-278,216,3,(vn)cūḷavaggapāḷi
-279,217,3,(vn)parivārapāḷi
+275,213,3,vinayapitaka
+276,214,3,vinayapitaka
+277,215,3,vinayapitaka
+278,216,3,vinayapitaka
+279,217,3,vinayapitaka
 280,139,925,samantapāsādikā
 281,214,2162,(VN)Bhikkhunīvibhaṅgo

routes/api.php

@@ -76,6 +76,7 @@ use App\Http\Controllers\PgPaliDictDownloadController;
 use App\Http\Controllers\SearchPaliDataController;
 use App\Http\Controllers\SearchPaliWbwController;
 use App\Http\Controllers\SearchPageNumberController;
+use App\Http\Controllers\NavPageController;
 
 /*
 |--------------------------------------------------------------------------
@@ -205,6 +206,7 @@ Route::group(['prefix' => 'v2'],function(){
     Route::apiResource('search-pali-wbw',SearchPaliWbwController::class);
     Route::get('search-pali-wbw-books',[SearchPaliWbwController::class,'book_list']);
     Route::apiResource('search-page-number',SearchPageNumberController::class);
+    Route::apiResource('nav-page',NavPageController::class);
 
     Route::get('download/{type1}/{type2}/{uuid}/{filename}', function ($type1,$type2,$uuid,$filename) {
         header("Content-Type: {$type1}/{$type1}");