Merge pull request #2379 from visuddhinanda/development

恢复 v8代码

api-v13/app/Http/Controllers/CorpusController.php

@@ -7,26 +7,29 @@ use Carbon\Carbon;
 use App\Models\Sentence;
 use App\Models\Channel;
 use App\Models\PaliText;
+use App\Models\WbwTemplate;
 use App\Models\WbwBlock;
 use App\Models\Wbw;
 use App\Models\Discussion;
 use App\Models\PaliSentence;
 use App\Models\SentSimIndex;
+use App\Models\CustomBookSentence;
 use App\Models\CustomBook;
 
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
+
 use App\Http\Api\MdRender;
 use App\Http\Api\SuggestionApi;
 use App\Http\Api\ChannelApi;
 use App\Http\Api\UserApi;
 use App\Http\Api\StudioApi;
-use App\Services\AuthService;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Arr;
 use App\Http\Resources\TocResource;
 use Illuminate\Support\Facades\Redis;
+use App\Services\AuthService;
 
 class CorpusController extends Controller
 {
@@ -78,7 +81,7 @@ class CorpusController extends Controller
     public function index(Request $request)
     {
         //
-        switch ($request->input('view')) {
+        switch ($request->get('view')) {
             case 'para':
                 return $this->showPara($request);
                 break;
@@ -110,8 +113,8 @@ class CorpusController extends Controller
         //
     }
     public function getSentTpl(
-        $id,
-        $inputChannels,
+        string $id,
+        array $inputChannels,
         $mode = 'edit',
         $onlyProps = false,
         $format = 'react'
@@ -162,18 +165,7 @@ class CorpusController extends Controller
                 break;
             }
         }
-        if (count($record) === 0) {
-            return null;
-        }
-        return $this->makeContent(
-            $record,
-            $mode,
-            $channelIndex,
-            [],
-            $onlyProps,
-            false,
-            $format
-        );
+        return $this->makeContent($record, $mode, $channelIndex, [], $onlyProps, false, $format);
     }
     /**
      * Display the specified resource.
@@ -187,7 +179,7 @@ class CorpusController extends Controller
         if ($user) {
             $this->userUuid = $user['user_uid'];
         }
-        $channels = \explode('_', $request->input('channels'));
+        $channels = \explode('_', $request->get('channels'));
 
         $this->result['uid'] = "";
         $this->result['title'] = "";
@@ -195,7 +187,7 @@ class CorpusController extends Controller
         $this->result['summary'] = "";
         $this->result['lang'] = "";
         $this->result['status'] = 30;
-        $this->result['content'] = $this->getSentTpl($id, $channels, $request->input('mode', 'edit'));
+        $this->result['content'] = $this->getSentTpl($id, $channels, $request->get('mode', 'edit'));
         return $this->ok($this->result);
     }
     /**
@@ -273,7 +265,7 @@ class CorpusController extends Controller
     public function showPara(Request $request)
     {
         if ($request->has('debug')) {
-            $this->debug = explode(',', $request->input('debug'));
+            $this->debug = explode(',', $request->get('debug'));
         }
         $user = AuthService::current($request);
         if ($user) {
@@ -281,7 +273,7 @@ class CorpusController extends Controller
         }
         //
         $channels = [];
-        if ($request->input('mode') === 'edit') {
+        if ($request->get('mode') === 'edit') {
             //翻译模式加载json格式原文
             $channels[] = ChannelApi::getSysChannel('_System_Wbw_VRI_');
         } else {
@@ -290,19 +282,19 @@ class CorpusController extends Controller
         }
 
         if ($request->has('channels')) {
-            if (strpos($request->input('channels'), ',') === FALSE) {
-                $getChannel = explode('_', $request->input('channels'));
+            if (strpos($request->get('channels'), ',') === FALSE) {
+                $getChannel = explode('_', $request->get('channels'));
             } else {
-                $getChannel = explode(',', $request->input('channels'));
+                $getChannel = explode(',', $request->get('channels'));
             }
             $channels = array_merge($channels, $getChannel);
         }
-        $para = explode(",", $request->input('par'));
+        $para = explode(",", $request->get('par'));
 
         //段落所在章节
-        $parent = PaliText::where('book', $request->input('book'))
+        $parent = PaliText::where('book', $request->get('book'))
             ->where('paragraph', $para[0])->first();
-        $chapter = PaliText::where('book', $request->input('book'))
+        $chapter = PaliText::where('book', $request->get('book'))
             ->where('paragraph', $parent->parent)->first();
         if ($chapter) {
             if (empty($chapter->toc)) {
@@ -356,7 +348,7 @@ class CorpusController extends Controller
          * 获取句子数据
          */
         $record = Sentence::select($this->selectCol)
-            ->where('book_id', $request->input('book'))
+            ->where('book_id', $request->get('book'))
             ->whereIn('paragraph', $para)
             ->whereIn('channel_uid', $channels)
             ->orderBy('paragraph')
@@ -365,7 +357,7 @@ class CorpusController extends Controller
         if (count($record) === 0) {
             $this->result['content'] = "<span>No Data</span>";
         } else {
-            $this->result['content'] = $this->makeContent($record, $request->input('mode', 'read'), $indexChannel, $indexedHeading, false, true);
+            $this->result['content'] = $this->makeContent($record, $request->get('mode', 'read'), $indexChannel, $indexedHeading, false, true);
         }
 
         return $this->ok($this->result);
@@ -380,7 +372,7 @@ class CorpusController extends Controller
     public function showChapter(Request $request, string $id)
     {
         if ($request->has('debug')) {
-            $this->debug = explode(',', $request->input('debug'));
+            $this->debug = explode(',', $request->get('debug'));
         }
         $user = AuthService::current($request);
         if ($user) {
@@ -390,10 +382,10 @@ class CorpusController extends Controller
         $sentId = \explode('-', $id);
         $channels = [];
         if ($request->has('channels')) {
-            if (strpos($request->input('channels'), ',') === FALSE) {
-                $_channels = explode('_', $request->input('channels'));
+            if (strpos($request->get('channels'), ',') === FALSE) {
+                $_channels = explode('_', $request->get('channels'));
             } else {
-                $_channels = explode(',', $request->input('channels'));
+                $_channels = explode(',', $request->get('channels'));
             }
             foreach ($_channels as $key => $channel) {
                 if (Str::isUuid($channel)) {
@@ -402,7 +394,7 @@ class CorpusController extends Controller
             }
         }
 
-        $mode = $request->input('mode', 'read');
+        $mode = $request->get('mode', 'read');
         if ($mode === 'read') {
             //阅读模式加载html格式原文
             $channelId = ChannelApi::getSysChannel('_System_Pali_VRI_');
@@ -518,8 +510,8 @@ class CorpusController extends Controller
             }
         }
 
-        $pFrom = $request->input('from', $paraFrom);
-        $pTo = $request->input('to', $paraTo);
+        $pFrom = $request->get('from', $paraFrom);
+        $pTo = $request->get('to', $paraTo);
         //根据句子的长度找到这次应该加载的段落
 
         $paliText = PaliText::select(['paragraph', 'lenght'])
@@ -546,8 +538,7 @@ class CorpusController extends Controller
         if (count($record) === 0) {
             return $this->error("no data");
         }
-        $this->result['content'] = json_encode($this->makeContent($record, $mode, $indexChannel), JSON_UNESCAPED_UNICODE);
-        $this->result['content_type'] = 'json';
+        $this->result['content'] = $this->makeContent($record, $mode, $indexChannel, $indexedHeading, false, true);
         if (!$request->has('from')) {
             //第一次才显示toc
             $this->result['toc'] = TocResource::collection($toc);
@@ -556,8 +547,8 @@ class CorpusController extends Controller
             $this->result['from'] = $currTo + 1;
             $this->result['to'] = $pTo;
             $this->result['paraId'] = $id;
-            $this->result['channels'] = $request->input('channels');
-            $this->result['mode'] = $request->input('mode');
+            $this->result['channels'] = $request->get('channels');
+            $this->result['mode'] = $request->get('mode');
         }
 
         return $this->ok($this->result);
@@ -592,16 +583,11 @@ class CorpusController extends Controller
      * $indexChannel channel索引
      * $indexedHeading 标题索引 用于给段落加标题标签 <h1> ect.
      */
-    private function makeContent(
-        $record,
-        $mode,
-        $indexChannel,
-        $indexedHeading = [],
-        $onlyProps = false,
-        $paraMark = false,
-        $format = 'react'
-    ) {
+    private function makeContent($record, $mode, $indexChannel, $indexedHeading = [], $onlyProps = false, $paraMark = false, $format = 'react')
+    {
         $content = [];
+        $lastSent = "0-0";
+        $sentCount = 0;
         $sent = [];
         $sent["origin"] = [];
         $sent["translation"] = [];
@@ -609,7 +595,7 @@ class CorpusController extends Controller
 
         //获取句子编号列表
         $sentList = [];
-        foreach ($record as  $value) {
+        foreach ($record as $key => $value) {
             $currSentId = "{$value->book_id}-{$value->paragraph}-{$value->word_start}-{$value->word_end}";
             $sentList[$currSentId] = [$value->book_id, $value->paragraph, $value->word_start, $value->word_end];
             $value->sid = "{$currSentId}_{$value->channel_uid}";
@@ -626,6 +612,7 @@ class CorpusController extends Controller
             if ($currPara !== $para) {
                 $currPara = $para;
                 //输出段落标记
+
                 if ($paraMark) {
                     $sentInPara = array();
                     foreach ($sentList as $sentId => $sentParam) {
@@ -766,19 +753,15 @@ class CorpusController extends Controller
                                 "/sent/{$channelId}/{$currSentId}/{$format}",
                                 config('mint.cache.expire'),
                                 function () use ($row, $mode, $format) {
-                                    if ($row->content_type === 'markdown') {
-                                        return MdRender::render(
-                                            $row->content,
-                                            [$row->channel_uid],
-                                            null,
-                                            $mode,
-                                            "nissaya",
-                                            $row->content_type,
-                                            $format
-                                        );
-                                    } else {
-                                        return null;
-                                    }
+                                    return MdRender::render(
+                                        $row->content,
+                                        [$row->channel_uid],
+                                        null,
+                                        $mode,
+                                        "nissaya",
+                                        $row->content_type,
+                                        $format
+                                    );
                                 }
                             );
                             break;
@@ -820,7 +803,6 @@ class CorpusController extends Controller
                         break;
                 }
             }
-            //FIXME 移到for外面
             if ($onlyProps) {
                 return $sent;
             }
@@ -832,234 +814,6 @@ class CorpusController extends Controller
         $output = \implode("", $content);
         return "<div>{$output}</div>";
     }
-
-    /**
-     * 根据句子库数据生成以段落为单位的文章内容
-     * $record 句子数据
-     * $mode read | edit | wbw
-     * $indexChannel channel索引
-     * $indexedHeading 标题索引 用于给段落加标题标签 <h1> ect.
-     */
-    private function makeContentObj($record, $mode, $indexChannel, $format = 'react')
-    {
-        $content = [];
-
-
-        //获取句子编号列表
-        $paraIndex = [];
-        foreach ($record as  $value) {
-            $currSentId = "{$value->book_id}-{$value->paragraph}-{$value->word_start}-{$value->word_end}";
-            $value->sid = "{$currSentId}_{$value->channel_uid}";
-
-            $currParaId = "{$value->book_id}-{$value->paragraph}";
-            if (!isset($paraIndex[$currParaId])) {
-                $paraIndex[$currParaId] = [];
-            }
-            $paraIndex[$currParaId][] = $value;
-        }
-        $channelsId = array();
-        foreach ($indexChannel as $channelId => $info) {
-            $channelsId[] = $channelId;
-        }
-        array_pop($channelsId);
-        //遍历列表查找每个句子的所有channel的数据，并填充
-        $paragraphs = [];
-        foreach ($paraIndex as $currParaId => $sentData) {
-            $arrParaId = explode('-', $currParaId);
-            $sentIndex = [];
-            foreach ($sentData as  $sent) {
-                $currSentId = "{$sent->book_id}-{$sent->paragraph}-{$sent->word_start}-{$sent->word_end}";
-                $sentIndex[$currSentId] = [$sent->book_id, $sent->paragraph, $sent->word_start, $sent->word_end];
-            }
-            $sentInPara = array_values($sentIndex);
-            $paraProps = [
-                'book' => $arrParaId[0],
-                'para' => $arrParaId[1],
-                'channels' => $channelsId,
-                'sentences' => $sentInPara,
-                'mode' => $mode,
-                'children' => [],
-            ];
-            //建立段落里面的句子列表
-            foreach ($sentIndex as $ids => $arrSentId) {
-                $sentNode = $this->newSent($arrSentId[0], $arrSentId[1], $arrSentId[2], $arrSentId[3]);
-                foreach ($indexChannel as $channelId => $info) {
-                    # code...
-                    $sid = "{$ids}_{$channelId}";
-                    if (isset($info->studio)) {
-                        $studioInfo = $info->studio;
-                    } else {
-                        $studioInfo = null;
-                    }
-                    $newSent = [
-                        "content" => "",
-                        "html" => "",
-                        "book" => $arrSentId[0],
-                        "para" => $arrSentId[1],
-                        "wordStart" => $arrSentId[2],
-                        "wordEnd" => $arrSentId[3],
-                        "channel" => [
-                            "name" => $info->name,
-                            "type" => $info->type,
-                            "id" => $info->uid,
-                            'lang' => $info->lang,
-                        ],
-                        "studio" => $studioInfo,
-                        "updateAt" => "",
-                        "suggestionCount" => SuggestionApi::getCountBySent($arrSentId[0], $arrSentId[1], $arrSentId[2], $arrSentId[3], $channelId),
-                    ];
-
-                    $row = Arr::first($sentData, function ($value, $key) use ($sid) {
-                        return $value->sid === $sid;
-                    });
-                    if ($row) {
-                        $newSent['id'] = $row->uid;
-                        $newSent['content'] = $row->content;
-                        $newSent['contentType'] = $row->content_type;
-                        $newSent['html'] = '';
-                        $newSent["editor"] = UserApi::getByUuid($row->editor_uid);
-                        /**
-                         * TODO 刷库改数据
-                         * 旧版api没有更新updated_at所以造成旧版的数据updated_at数据比modify_time 要晚
-                         */
-                        $newSent['forkAt'] =  $row->fork_at; //
-                        $newSent['updateAt'] =  $row->updated_at; //
-                        $newSent['updateAt'] = date("Y-m-d H:i:s.", $row->modify_time / 1000) . ($row->modify_time % 1000) . " UTC";
-
-                        $newSent['createdAt'] = $row->created_at;
-                        if ($mode !== "read") {
-                            if (isset($row->acceptor_uid) && !empty($row->acceptor_uid)) {
-                                $newSent["acceptor"] = UserApi::getByUuid($row->acceptor_uid);
-                                $newSent["prEditAt"] = $row->pr_edit_at;
-                            }
-                        }
-                        switch ($info->type) {
-                            case 'wbw':
-                            case 'original':
-                                //
-                                // 在编辑模式下。
-                                // 如果是原文，查看是否有逐词解析数据，
-                                // 有的话优先显示。
-                                // 阅读模式直接显示html原文
-                                // 传过来的数据一定有一个原文channel
-                                //
-                                if ($mode === "read") {
-                                    $newSent['content'] = "";
-                                    $newSent['html'] = MdRender::render(
-                                        $row->content,
-                                        [$row->channel_uid],
-                                        null,
-                                        $mode,
-                                        "translation",
-                                        $row->content_type,
-                                        $format
-                                    );
-                                } else {
-                                    if ($row->content_type === 'json') {
-                                        $newSent['channel']['type'] = "wbw";
-                                        if (isset($this->wbwChannels[0])) {
-                                            $newSent['channel']['name'] = $indexChannel[$this->wbwChannels[0]]->name;
-                                            $newSent['channel']['lang'] = $indexChannel[$this->wbwChannels[0]]->lang;
-                                            $newSent['channel']['id'] = $this->wbwChannels[0];
-                                            //存在一个translation channel
-                                            //尝试查找逐词解析数据。找到，替换现有数据
-                                            $wbwData = $this->getWbw(
-                                                $arrSentId[0],
-                                                $arrSentId[1],
-                                                $arrSentId[2],
-                                                $arrSentId[3],
-                                                $this->wbwChannels[0]
-                                            );
-                                            if ($wbwData) {
-                                                $newSent['content'] = $wbwData;
-                                                $newSent['contentType'] = 'json';
-                                                $newSent['html'] = "";
-                                                $newSent['studio'] = $indexChannel[$this->wbwChannels[0]]->studio;
-                                            }
-                                        }
-                                    } else {
-                                        $newSent['content'] = $row->content;
-                                        $newSent['html'] = MdRender::render(
-                                            $row->content,
-                                            [$row->channel_uid],
-                                            null,
-                                            $mode,
-                                            "translation",
-                                            $row->content_type,
-                                            $format
-                                        );
-                                    }
-                                }
-
-                                break;
-                            case 'nissaya':
-                                $newSent['html'] = Cache::remember(
-                                    "/sent/{$channelId}/{$ids}/{$format}",
-                                    config('mint.cache.expire'),
-                                    function () use ($row, $mode, $format) {
-                                        if ($row->content_type === 'markdown') {
-                                            return MdRender::render(
-                                                $row->content,
-                                                [$row->channel_uid],
-                                                null,
-                                                $mode,
-                                                "nissaya",
-                                                $row->content_type,
-                                                $format
-                                            );
-                                        } else {
-                                            return null;
-                                        }
-                                    }
-                                );
-                                break;
-                            case 'commentary':
-                                $options = [
-                                    'debug' => $this->debug,
-                                    'format' => $format,
-                                    'mode' => $mode,
-                                    'channelType' => 'translation',
-                                    'contentType' => $row->content_type,
-                                ];
-                                $mdRender = new MdRender($options);
-                                $newSent['html'] = $mdRender->convert($row->content, $channelsId);
-                                break;
-                            default:
-                                $options = [
-                                    'debug' => $this->debug,
-                                    'format' => $format,
-                                    'mode' => $mode,
-                                    'channelType' => 'translation',
-                                    'contentType' => $row->content_type,
-                                ];
-                                $mdRender = new MdRender($options);
-                                $newSent['html'] = $mdRender->convert($row->content, [$row->channel_uid]);
-                                //Log::debug('md render', ['content' => $row->content, 'options' => $options, 'render' => $newSent['html']]);
-                                break;
-                        }
-                    } else {
-                        Log::warning('no sentence record');
-                    }
-                    switch ($info->type) {
-                        case 'wbw':
-                        case 'original':
-                            array_push($sentNode["origin"], $newSent);
-                            break;
-                        case 'commentary':
-                            array_push($sentNode["commentaries"], $newSent);
-                            break;
-                        default:
-                            array_push($sentNode["translation"], $newSent);
-                            break;
-                    }
-                }
-                $paraProps['children'][] = $sentNode;
-            }
-            $paragraphs[] = $paraProps;
-        }
-        return $paragraphs;
-    }
-
     public function getWbw($book, $para, $start, $end, $channel)
     {
         /**
@@ -1092,7 +846,7 @@ class CorpusController extends Controller
                 $xmlWord = simplexml_load_string($xmlString);
                 $wordsList = $xmlWord->xpath('//word');
             } catch (\Exception $e) {
-                Log::error('corpus', ['error' => $e]);
+                Log::error('corpus getWbw', ['error' => $e, 'data' => $xmlString]);
                 return false;
             }