Browse Source

Merge pull request #1060 from visuddhinanda/laravel

:bug: 导出wbw 500
visuddhinanda 3 years ago
parent
commit
980bdf3306

+ 7 - 6
app/Console/Commands/TestMdRender.php

@@ -51,13 +51,14 @@ class TestMdRender extends Command
         $markdown2 .= "{{exercise\n|id=1\n|content={{168-916-10-37}}}}";
         $markdown2 .= "{{exercise\n|id=1\n|content={{168-916-10-37}}}}";
         $markdown2 .= "{{exercise\n|id=2\n|content=# ddd}}";
         $markdown2 .= "{{exercise\n|id=2\n|content=# ddd}}";
 
 
+        $markdown2 = "{{note|trigger=kacayana|text={{99-556-8-12}}}}";
         //echo MdRender::render($markdown,'00ae2c48-c204-4082-ae79-79ba2740d506');
         //echo MdRender::render($markdown,'00ae2c48-c204-4082-ae79-79ba2740d506');
-        $wiki = MdRender::markdown2wiki($markdown2);
-        $xml = MdRender::wiki2xml($wiki);
-        $html = MdRender::xmlQueryId($xml, "1");
-        $sent = MdRender::take_sentence($html);
-        print_r($sent);
-        //echo MdRender::render2($markdown2,'00ae2c48-c204-4082-ae79-79ba2740d506','2');
+        //$wiki = MdRender::markdown2wiki($markdown2);
+        //$xml = MdRender::wiki2xml($wiki);
+        //$html = MdRender::xmlQueryId($xml, "1");
+        //$sent = MdRender::take_sentence($html);
+        //print_r($sent);
+        echo MdRender::render2($markdown2,'00ae2c48-c204-4082-ae79-79ba2740d506');
         return 0;
         return 0;
     }
     }
 }
 }

+ 1 - 1
app/Http/Api/TemplateRender.php

@@ -89,7 +89,7 @@ class TemplateRender{
     private  function render_note(){
     private  function render_note(){
 
 
         $props = ["note" => $this->get_param($this->param,"text",1)];
         $props = ["note" => $this->get_param($this->param,"text",1)];
-        $trigger = $this->get_param($param,"trigger",2);
+        $trigger = $this->get_param($this->param,"trigger",2);
         if(!empty($trigger)){
         if(!empty($trigger)){
             $props["trigger"] = $trigger;
             $props["trigger"] = $trigger;
             $innerString = $props["trigger"];
             $innerString = $props["trigger"];

+ 13 - 3
app/Http/Controllers/ExportWbwController.php

@@ -55,9 +55,19 @@ class ExportWbwController extends Controller
                 foreach ($wordsList as $word) {
                 foreach ($wordsList as $word) {
                     $pali = $word->real->__toString();
                     $pali = $word->real->__toString();
                     $case = explode("#",$word->case->__toString()) ;
                     $case = explode("#",$word->case->__toString()) ;
-                    $type = $case[0];
-                    $grammar = $case[1];
-                    $grammar = str_replace("null","",$grammar);
+                    if(isset($case[0])){
+                        $type = $case[0];
+                    }else{
+                        $type = "";
+                    }
+
+                    if(isset($case[1])){
+                        $grammar = $case[1];
+                        $grammar = str_replace("null","",$grammar);
+                    }else{
+                        $grammar = "";
+                    }
+
                     $style = $word->style->__toString();
                     $style = $word->style->__toString();
                     $factormeaning = str_replace("
","",$word->om->__toString());
                     $factormeaning = str_replace("
","",$word->om->__toString());
                     $factormeaning = str_replace("↓↓","",$factormeaning);
                     $factormeaning = str_replace("↓↓","",$factormeaning);