chengjie месяцев назад: 5
Родитель
Сommit
5027ed8e3b
1 измененных файлов с 10 добавлено и 18 удалено
  1. 10 18
      src/test/build.test.js

+ 10 - 18
src/test/build.test.js

@@ -69,23 +69,14 @@ async function runScript(){
69
             }
69
             }
70
 
70
 
71
             //console.log("result1:"+result);
71
             //console.log("result1:"+result);
72
-            
73
-            if (result.indexOf("Here's the breakdown")>0){
74
-                result=result.substring(0,result.indexOf("Here's the breakdown"));
75
-            }
76
-            else if (result.indexOf("Here's a breakdown")>0){
77
-                result=result.substring(0,result.indexOf("Here's a breakdown"));
78
-            }
79
-            else if (result.indexOf("Here 's a breakdown")>0){
80
-                result=result.substring(0,result.indexOf("Here 's a breakdown"));
81
-            }
82
-            else if (result.indexOf("Here is the breakdown")>0){
83
-                result=result.substring(0,result.indexOf("Here is the breakdown"));
84
-            }
85
-            else if (result.indexOf("Here is the explanation")>0){
86
-                result=result.substring(0,result.indexOf("Here is the explanation"));
72
+
73
+            if (result.indexOf("Here is")>0 || result.indexOf("Here's")>0 || result.indexOf("Here 's")>0){
74
+                if (result.indexOf(" breakdown")>0 || result.indexOf(" explanation")>0) {
75
+                    result=result.substring(0,result.indexOf("Here"));
76
+                }
87
             }
77
             }
88
-            console.log("result2:"+result);
78
+
79
+            
89
 
80
 
90
             result=result.replace("\"\":","\":");
81
             result=result.replace("\"\":","\":");
91
             result=result.replace("\"\" :","\" :");
82
             result=result.replace("\"\" :","\" :");
@@ -101,9 +92,10 @@ async function runScript(){
101
             result=result.replace(",\"\"",",\"");
92
             result=result.replace(",\"\"",",\"");
102
             result=result.replace("\"\",","\",");
93
             result=result.replace("\"\",","\",");
103
 
94
 
95
+            result=stringUtils.Trim(result);
96
+
97
+            //console.log("result2:"+result);
104
 
98
 
105
-            
106
-            //console.log(result); 
107
             let sql2="update Words set EnglishExplanation=? where ID="+item.ID+";";
99
             let sql2="update Words set EnglishExplanation=? where ID="+item.ID+";";
108
             await commonModel.RunSql(result,sql2);
100
             await commonModel.RunSql(result,sql2);
109
             
101