Merge pull request #539 from visuddhinanda/master

兼容旧的sim 参数

app/article/article.js

@@ -262,6 +262,7 @@ function palicanon_load() {
 			}
 			break;
 		case "simsent":
+		case "sim":
 			param = {view: _view,id:_id};
 			break;
 		default:

app/article/index.php

@@ -350,6 +350,7 @@ span.fancytree-node{
 			render_toc();
 		break;
 		case "simsent":
+		case "sim":
 			palicanon_load();
 			break;
 		default:

app/article/my_collect.js

@@ -223,9 +223,14 @@ function tocGetTreeData(articles,active=""){
 		}
 		else{
 			// 小于
-			do {
-				treeParents.pop();
-			} while (treeParents[treeParents.length-1].level>=newNode.level);
+			try{
+				do {
+					treeParents.pop();
+				} while (treeParents[treeParents.length-1].level>=newNode.level);
+			}catch(e){
+				console.log("toc index:"+index,articles[index]);
+			}
+
 			
 			currParentNode = treeParents[treeParents.length-1];
 			treeParents[treeParents.length-1].children.push(newNode);

app/install/db_update_palitext.php

@@ -1,4 +1,5 @@
 <?php
+#根据pali_text 里面的*_title.csv数据更新数据库
 require_once "install_head.php";
 require_once "../public/_pdo.php";
 ?>

app/reader/get_para1.php

@@ -45,7 +45,7 @@ if ($_view == "sent") {
     echo json_encode($output, JSON_UNESCAPED_UNICODE);
     exit;
 }
-if ($_view == "simsent") {
+if ($_view == "simsent" || $_view == "sim") {
 	$mPaliSent = new PaliSentence($mRedis);
 	$mPaliSim = new PaliSimSentence($mRedis);
 	if(!isset($_GET["id"])){

pali_title/100_title.csv

@@ -2,7 +2,7 @@ id,book,par_num,level,class,title,text
 NULL,p100,1,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p100,2,100,nikaya,,Aṅguttaranikāye
 NULL,p100,3,1,book,Dukanipāta-aṭṭhakathā,Dukanipāta-aṭṭhakathā
-NULL,p100,4,3,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
+NULL,p100,4,100,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
 NULL,p100,5,2,chapter,1. Kammakāraṇavaggo,1. Kammakāraṇavaggo
 NULL,p100,6,4,subhead,1. Vajjasuttavaṇṇanā,1. Vajjasuttavaṇṇanā
 NULL,p100,7,100,bodytext,,"1. Dukanipātassa  paṭhame vajjānīti dosā aparādhā. Diṭṭhadhammikanti diṭṭheva dhamme imasmiṃyeva attabhāve uppannaphalaṃ. Samparāyikanti samparāye anāgate attabhāve uppannaphalaṃ. Āgucārinti pāpakāriṃ aparādhakārakaṃ. Rājāno gahetvā vividhā kammakāraṇā kārenteti coraṃ gahetvā vividhā kammakāraṇā rājapurisā karonti, rājāno pana tā kārenti nāma. Taṃ coraṃ evaṃ  kammakāraṇā kāriyamānaṃ esa passati. Tena vuttaṃ – ‘‘passati coraṃ āgucāriṃ rājāno gahetvā vividhā kammakāraṇā kārente’’ti. Addhadaṇḍakehīti muggarehi, pahārasādhanatthaṃ vā catuhatthadaṇḍaṃ dvedhā chetvā gahitadaṇḍakehi. Bilaṅgathālikanti kañjiyaukkhalikakammakāraṇaṃ. Taṃ karontā sīsakaṭāhaṃ uppāṭetvā tattaṃ ayoguḷaṃ saṇḍāsena gahetvā tattha pakkhipanti, tena matthaluṅgaṃ pakkuthitvā  uttarati. Saṅkhamuṇḍikanti saṅkhamuṇḍakammakāraṇaṃ. Taṃ karontā uttaroṭṭhaubhatokaṇṇacūḷikagalavāṭakaparicchedena  cammaṃ chinditvā sabbakese ekato gaṇṭhiṃ katvā daṇḍakena veṭhetvā uppāṭenti, saha kesehi cammaṃ uṭṭhahati. Tato sīsakaṭāhaṃ thūlasakkharāhi ghaṃsitvā dhovantā saṅkhavaṇṇaṃ karonti. Rāhumukhanti rāhumukhakammakāraṇaṃ. Taṃ karontā saṅkunā mukhaṃ vivaritvā antomukhe dīpaṃ jālenti, kaṇṇacūḷikāhi vā paṭṭhāya mukhaṃ nikhādanena khananti, lohitaṃ paggharitvā mukhaṃ pūreti."

pali_title/99_title.csv

@@ -2,7 +2,7 @@ id,book,par_num,level,class,title,text
 NULL,p99,1,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p99,2,100,nikaya,,Aṅguttaranikāye
 NULL,p99,3,1,book,Ekakanipāta-aṭṭhakathā,Ekakanipāta-aṭṭhakathā
-NULL,p99,4,3,subsubhead,Ganthārambhakathā,Ganthārambhakathā
+NULL,p99,4,2,subsubhead,Ganthārambhakathā,Ganthārambhakathā
 NULL,p99,5,100,gatha1,,"‘‘Karuṇāsītalahadayaṃ, paññāpajjotavihatamohatamaṃ;"
 NULL,p99,6,100,gathalast,,"Sanarāmaralokagaruṃ, vande sugataṃ gativimuttaṃ."
 NULL,p99,7,100,gatha1,,"‘‘Buddhopi buddhabhāvaṃ, bhāvetvā ceva sacchikatvā ca;"
@@ -41,7 +41,7 @@ NULL,p99,39,100,gatha1,,"‘‘Majjhe visuddhimaggo, esa catunnampi āgamānañh
 NULL,p99,40,100,gathalast,,"Ṭhatvā pakāsayissati, tattha yathābhāsitamatthaṃ."
 NULL,p99,41,100,gatha1,,"‘‘Icceva  kato tasmā, tampi gahetvāna saddhimetāya;"
 NULL,p99,42,100,gathalast,,"Aṭṭhakathāya vijānatha, aṅguttaranissitaṃ attha’’nti."
-NULL,p99,43,3,title,Saṃkhepakathā,Saṃkhepakathā
+NULL,p99,43,100,title,Saṃkhepakathā,Saṃkhepakathā
 NULL,p99,44,2,chapter,1. Rūpādivaggavaṇṇanā,1. Rūpādivaggavaṇṇanā
 NULL,p99,45,100,bodytext,,Tattha aṅguttarāgamo nāma ekakanipāto dukanipāto tikanipāto catukkanipāto pañcakanipāto chakkanipāto sattakanipāto aṭṭhakanipāto navakanipāto dasakanipāto ekādasakanipātoti ekādasa nipātā honti. Suttato –
 NULL,p99,46,100,gatha1,,"‘‘Nava suttasahassāni, pañca suttasatāni ca;"

v2/config/database.php

@@ -72,6 +72,9 @@ return [
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
+			'options' => [
+				PDO::ATTR_PERSISTENT => true,
+			],
             'prefix' => '',
             'prefix_indexes' => true,
             'schema' => 'public',