Merge branch 'iapt-platform:master' into master

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

@@ -363,6 +363,7 @@ function show_content(){
 			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."
@@ -324,7 +324,7 @@ NULL,p100,322,100,centered,,Dukanipātassa saṃvaṇṇanā niṭṭhitā.
 NULL,p100,323,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p100,324,100,nikaya,,Aṅguttaranikāye
 NULL,p100,325,1,book,Tikanipāta-aṭṭhakathā,Tikanipāta-aṭṭhakathā
-NULL,p100,326,3,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
+NULL,p100,326,100,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
 NULL,p100,327,2,chapter,1. Bālavaggo,1. Bālavaggo
 NULL,p100,328,4,subhead,1. Bhayasuttavaṇṇanā,1. Bhayasuttavaṇṇanā
 NULL,p100,329,100,bodytext,,1. Tikanipātassa  paṭhame bhayānītiādīsu bhayanti cittutrāso. Upaddavoti anekaggatākāro. Upasaggoti upasaṭṭhākāro tattha tattha lagganākāro.
@@ -879,7 +879,7 @@ NULL,p100,877,100,bodytext,,"Ukkaṃ bandheyyāti aṅgārakapallaṃ sajjeyya.
 NULL,p100,878,100,bodytext,,Sammā samādhiyati āsavānaṃ khayāyāti arahattaphalatthāya sammā ṭhapīyati. Ettāvatā  hi vipassanaṃ vaḍḍhetvā arahattappatto bhikkhu dassito. Idāni tassa khīṇāsavassa abhiññāya paṭipadaṃ dassento yassa yassa cātiādimāha. Taṃ heṭṭhā vuttanayeneva veditabbaṃ.
 NULL,p100,879,100,centered,,Loṇakapallavaggo pañcamo.
 NULL,p100,880,100,centered,,Dutiyapaṇṇāsakaṃ niṭṭhitaṃ.
-NULL,p100,881,3,title,3. Tatiyapaṇṇāsakaṃ,3. Tatiyapaṇṇāsakaṃ
+NULL,p100,881,100,title,3. Tatiyapaṇṇāsakaṃ,3. Tatiyapaṇṇāsakaṃ
 NULL,p100,882,2,chapter,(11) 1. Sambodhavaggo,(11) 1. Sambodhavaggo
 NULL,p100,883,4,subhead,1. Pubbevasambodhasuttavaṇṇanā,1. Pubbevasambodhasuttavaṇṇanā
 NULL,p100,884,100,bodytext,,"104. Tatiyassa  paṭhame pubbeva sambodhāti sambodhito pubbeva, ariyamaggappattito aparabhāgeyevāti vuttaṃ hoti. Anabhisambuddhassāti appaṭividdhacatusaccassa. Bodhisattasseva satoti bujjhanakasattasseva sato, sammāsambodhiṃ adhigantuṃ ārabhantasseva sato, sambodhiyā vā sattasseva laggasseva sato. Dīpaṅkarassa hi bhagavato pādamūle aṭṭhadhammasamodhānena abhinīhārasamiddhito pabhuti tathāgato sammāsambodhiṃ satto laggo ‘‘pattabbā mayā esā’’ti tadadhigamāya parakkamaṃ amuñcantoyeva āgato, tasmā bodhisattoti vuccati. Ko nu khoti katamo nu kho. Lokoti saṅkhāraloko. Assādoti madhurākāro. Ādīnavoti anabhinanditabbākāro. Tassa mayhanti tassa evaṃ bodhisattasseva sato mayhaṃ. Chandarāgavinayo chandarāgappahānanti nibbānaṃ āgamma ārabbha paṭicca chandarāgo vinayaṃ gacchati pahīyati, tasmā nibbānaṃ ‘‘chandarāgavinayo chandarāgappahāna’’nti vuccati. Idaṃ lokanissaraṇanti idaṃ nibbānaṃ lokato nissaṭattā lokanissaraṇanti vuccati. Yāvakīvanti  yattakaṃ pamāṇaṃ kālaṃ. Abbhaññāsinti abhivisiṭṭhena ariyamaggañāṇena aññāsiṃ. Ñāṇañca pana me dassananti dvīhipi padehi paccavekkhaṇañāṇaṃ vuttaṃ. Sesamettha uttānamevāti."
@@ -996,7 +996,7 @@ NULL,p100,994,100,centered,,Tikanipātassa saṃvaṇṇanā niṭṭhitā.
 NULL,p100,995,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p100,996,100,nikaya,,Aṅguttaranikāye
 NULL,p100,997,1,book,Catukkanipāta-aṭṭhakathā,Catukkanipāta-aṭṭhakathā
-NULL,p100,998,3,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
+NULL,p100,998,100,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
 NULL,p100,999,2,chapter,1. Bhaṇḍagāmavaggo,1. Bhaṇḍagāmavaggo
 NULL,p100,1000,4,subhead,1. Anubuddhasuttavaṇṇanā,1. Anubuddhasuttavaṇṇanā
 NULL,p100,1001,100,bodytext,,"1. Catukkanipātassa  paṭhame ananubodhāti abujjhanena ajānanena. Appaṭivedhāti appaṭivijjhanena apaccakkhakiriyāya. Dīghamaddhānanti cirakālaṃ. Sandhāvitanti bhavato bhavaṃ gamanavasena sandhāvitaṃ. Saṃsaritanti punappunaṃ gamanāgamanavasena saṃsaritaṃ. Mamañceva tumhākañcāti mayā ca tumhehi ca. Atha vā sandhāvitaṃ saṃsaritanti sandhāvanaṃ saṃsaraṇaṃ mamañceva  tumhākañca ahosīti evamettha attho veditabbo. Ariyassāti niddosassa. Sīlaṃ samādhi paññāti ime pana tayo dhammā maggaphalasampayuttāva veditabbā, vimuttināmena phalameva niddiṭṭhaṃ. Bhavataṇhāti bhavesu taṇhā. Bhavanettīti  bhavarajju. Taṇhāya eva etaṃ nāmaṃ. Tāya hi sattā goṇā viya gīvāya bandhitvā taṃ taṃ bhavaṃ nīyanti, tasmā bhavanettīti vuccati."
@@ -1364,7 +1364,7 @@ NULL,p100,1362,4,subhead,10. Potaliyasuttavaṇṇanā,10. Potaliyasuttavaṇṇ
 NULL,p100,1363,100,bodytext,,100. Dasame kālenāti yuttappattakālena. Khamatīti ruccati. Yadidaṃ tattha tattha kālaññutāti yā esā tattha tattha kālaṃ jānanā. Taṃ taṃ kālaṃ ñatvā hi avaṇṇārahassa avaṇṇakathanaṃ vaṇṇārahassa ca vaṇṇakathanaṃ paṇḍitānaṃ pakatīti dasseti.
 NULL,p100,1364,100,centered,,Asuravaggo pañcamo.
 NULL,p100,1365,100,centered,,Dutiyapaṇṇāsakaṃ niṭṭhitaṃ.
-NULL,p100,1366,3,title,3. Tatiyapaṇṇāsakaṃ,3. Tatiyapaṇṇāsakaṃ
+NULL,p100,1366,100,title,3. Tatiyapaṇṇāsakaṃ,3. Tatiyapaṇṇāsakaṃ
 NULL,p100,1367,2,chapter,(11) 1. Valāhakavaggo,(11) 1. Valāhakavaggo
 NULL,p100,1368,4,subhead,1-2. Valāhakasuttadvayavaṇṇanā,1-2. Valāhakasuttadvayavaṇṇanā
 NULL,p100,1369,100,bodytext,,"101-2. Tatiyapaṇṇāsakassa  paṭhame valāhakāti meghā. Bhāsitā hoti no kattāti ‘‘idañcidañca karissāmī’’ti kevalaṃ bhāsatiyeva, na karoti. Kattā hoti no bhāsitāti akathetvāva ‘‘idañcidañca mayā kātuṃ vaṭṭatī’’ti kattā hoti. Evaṃ sabbattha attho veditabbo. Dutiyaṃ uttānatthameva."

pali_title/181_title.csv

@@ -2,7 +2,7 @@ id,book,par_num,level,class,title,text
 NULL,p181,1,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p181,2,100,nikaya,,Aṅguttaranikāye
 NULL,p181,3,1,book,Ekakanipāta-ṭīkā,Ekakanipāta-ṭīkā
-NULL,p181,4,3,subsubhead,Ganthārambhakathā,Ganthārambhakathā
+NULL,p181,4,2,subsubhead,Ganthārambhakathā,Ganthārambhakathā
 NULL,p181,5,100,gatha1,,"Anantañāṇaṃ  karuṇāniketaṃ,"
 NULL,p181,6,100,gatha2,,Namāmi nāthaṃ jitapañcamāraṃ;
 NULL,p181,7,100,gatha3,,"Dhammaṃ visuddhaṃ bhavanāsahetuṃ,"
@@ -47,7 +47,7 @@ NULL,p181,45,100,gatha1,,"Tasmā  anuttānapadānamatthaṃ,"
 NULL,p181,46,100,gatha2,,Seṭṭhāya aṅguttaravaṇṇanāya;
 NULL,p181,47,100,gatha3,,"Sandassayissaṃ sakalaṃ suboddhuṃ,"
 NULL,p181,48,100,gathalast,,Nissāya pubbācariyappabhāvaṃ.
-NULL,p181,49,3,subsubhead,Ganthārambhakathāvaṇṇanā,Ganthārambhakathāvaṇṇanā
+NULL,p181,49,2,subsubhead,Ganthārambhakathāvaṇṇanā,Ganthārambhakathāvaṇṇanā
 NULL,p181,50,100,bodytext,,"1. Saṃvaṇṇanārambhe ratanattayaṃ namassitukāmo tassa visiṭṭhaguṇayogasandassanatthaṃ ‘‘karuṇāsītalahadaya’’ntiādimāha. Visiṭṭhaguṇayogena hi vandanārahabhāvo, vandanārahe ca katā vandanā yathādhippetamatthaṃ sādheti. Ettha ca saṃvaṇṇanārambhe ratanattayappaṇāmakaraṇappayojanaṃ tattha tattha bahudhā papañcenti ācariyā, mayaṃ pana idhādhippetameva payojanaṃ dassayissāma, tasmā saṃvaṇṇanārambhe ratanattayappaṇāmakaraṇaṃ yathāpaṭiññātasaṃvaṇṇanāya anantarāyena parisamāpanatthanti veditabbaṃ. Idameva hi payojanaṃ ācariyena idhādhippetaṃ. Tathā hi vakkhati –"
 NULL,p181,51,100,gatha1,,"‘‘Iti me pasannamatino, ratanattayavandanāmayaṃ puññaṃ;"
 NULL,p181,52,100,gathalast,,"Yaṃ suvihatantarāyo, hutvā tassānubhāvenā’’ti."

pali_title/182_title.csv

@@ -2,7 +2,7 @@ id,book,par_num,level,class,title,text
 NULL,p182,1,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p182,2,100,nikaya,,Aṅguttaranikāye
 NULL,p182,3,1,book,Dukanipāta-ṭīkā,Dukanipāta-ṭīkā
-NULL,p182,4,3,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
+NULL,p182,4,100,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
 NULL,p182,5,2,chapter,1. Kammakāraṇavaggo,1. Kammakāraṇavaggo
 NULL,p182,6,4,subhead,1. Vajjasuttavaṇṇanā,1. Vajjasuttavaṇṇanā
 NULL,p182,7,100,bodytext,,"1. Dukanipātassa  paṭhame pahārasādhanatthanti daṇḍappahārassa sukhasiddhi-atthaṃ. Kañjito nibbattaṃ kañjiyaṃ, āranālaṃ, yaṃ bilaṅgantipi vuccati, taṃ yattha siñcati, sā kañjiyaukkhalikā bilaṅgathālikā, taṃsadisaṃ kāraṇaṃ bilaṅgathālikaṃ. Sīsakaṭāhaṃ uppāṭetvāti ayoguḷappavesappamāṇaṃ chiddaṃ katvā. Saṅkhamuṇḍakammakāraṇanti saṅkhaṃ viya muṇḍakaraṇaṃ kammakāraṇaṃ. Rāhumukhakammakāraṇanti rāhumukhagatasūriyasadisakammakāraṇaṃ."
@@ -323,7 +323,7 @@ NULL,p182,321,100,centered,,Dukanipātavaṇṇanāya anuttānatthadīpanā sama
 NULL,p182,322,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p182,323,100,nikaya,,Aṅguttaranikāye
 NULL,p182,324,1,book,Tikanipāta-ṭīkā,Tikanipāta-ṭīkā
-NULL,p182,325,3,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
+NULL,p182,325,100,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
 NULL,p182,326,2,chapter,1. Bālavaggo,1. Bālavaggo
 NULL,p182,327,4,subhead,1. Bhayasuttavaṇṇanā,1. Bhayasuttavaṇṇanā
 NULL,p182,328,100,bodytext,,"1. Tikanipātassa  paṭhame bhayanti bhīti cetaso byadhoti āha ‘‘cittutrāso’’ti. Upaddavoti antarāyo. Tassa pana vikkhepakāraṇattā vuttaṃ ‘‘anekaggatākāro’’ti. Upasaggoti upasajjanaṃ, devatopapīḷādinā appaṭikāravighātāpatti. Sā pana yasmā paṭikārābhāvena vihaññamānassa kiñci kātuṃ asamatthassa osīdanakāraṇaṃ, tasmā vuttaṃ ‘‘tattha tattha lagganākāro’’ti. Yathāvutte divase anāgacchantesūti vañcetvā āgantuṃ niyamitadivase anāgacchantesu. Dvāre aggiṃ datvāti bahi anikkhamanatthāya dvāre aggiṃ datvā."
@@ -1022,7 +1022,7 @@ NULL,p182,1020,100,centered,,Tikanipātavaṇṇanāya anuttānatthadīpanā sam
 NULL,p182,1021,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p182,1022,100,nikaya,,Aṅguttaranikāye
 NULL,p182,1023,1,book,Catukkanipāta-ṭīkā,Catukkanipāta-ṭīkā
-NULL,p182,1024,3,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
+NULL,p182,1024,100,title,1. Paṭhamapaṇṇāsakaṃ,1. Paṭhamapaṇṇāsakaṃ
 NULL,p182,1025,2,chapter,1. Bhaṇḍagāmavaggo,1. Bhaṇḍagāmavaggo
 NULL,p182,1026,4,subhead,1-2. Anubuddhasuttādivaṇṇanā,1-2. Anubuddhasuttādivaṇṇanā
 NULL,p182,1027,100,bodytext,,"1-2. Catukkanipātassa  paṭhame anubodho pubbabhāgiyaṃ ñāṇaṃ, paṭivedho anubodhena abhisamayo. Tattha yasmā anubodhapubbako paṭivedho anubodhena vinā na hoti. Anubodho hi ekacco paṭivedhasambaddho, tadubhayābhāvahetukañca vaṭṭe saṃsaraṇaṃ, tasmā vuttaṃ pāḷiyaṃ ‘‘ananubodhā…pe… tumhākañcā’’ti. Paṭisandhiggahaṇavasena bhavato bhavantarūpagamanaṃ sandhāvanaṃ, aparāparaṃ cavanūpapajjanavasena sañcaraṇaṃ saṃsaraṇanti āha ‘‘bhavato’’tiādi. Sandhāvitasaṃsaritapadānaṃ kammasādhanataṃ sandhāyāha ‘‘mayā ca tumhehi cā’’ti paṭhamavikappe. Dutiyavikappe pana bhāvasādhanataṃ hadaye katvā ‘‘mamañceva tumhākañcā’’ti yathārutavaseneva vuttaṃ. Dīgharajjunā baddhasakuṇaṃ viya rajjuhattho puriso desantaraṃ taṇhārajjunā baddhaṃ sattasantānaṃ abhisaṅkhāro bhavantaraṃ neti etāyāti bhavanetti. Tenāha ‘‘bhavarajjū’’tiādī."

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',