Merge branch 'master' of https://github.com/visuddhinanda/mint

app/pali_sent/pali_sent.php

@@ -230,7 +230,7 @@ function sents_similar_to_id($id) {
 }
 
 $id = $argv[1];
-sents_similar_to_id($id);
+//sents_similar_to_id($id);
 
 if (!isset($_op)) {
 	exit(0);

app/pcdl/reader.php

@@ -625,6 +625,21 @@ else{
 		}
 	}	
 
+	$strSimSent = "";
+	if($_GET["view"]=="sent"){
+		$query = "select sim_sents from 'pali_sent' where book='$book' and paragraph='$paragraph' and begin='{$_GET["begin"]}' and end ='{$_GET["end"]}'";
+		$FetchSent = PDO_FetchOne($query);
+		if(!empty($FetchSent)){
+			$sim_sents = str_replace(",","','",$FetchSent);
+			$sim_sents = "'".$sim_sents."'";
+			$query = "SELECT book, paragraph,begin, end, text from 'pali_sent' where id IN ( {$sim_sents} ) ";
+			$FetchSim = PDO_FetchAll($query);
+			foreach ($FetchSim as $key => $value) {
+				$strSimSent .= "<div><a href=''>". $value["text"]."</div>";
+				$strSimSent .= "<div>"._get_para_path($value["book"],$value["paragraph"])."</div><br/>";
+			}
+		}
+	}
 
 	if(isset($_GET["sent_mode"])){
 
@@ -710,6 +725,8 @@ else{
 
 <div>
 <a name="sim_doc"></a>
+<div>相似句子</div>
+<?php echo $strSimSent; ?>
 <div>相关段落</div>
 <ul>
 <?php

app/studio/dict_find_auto.php

@@ -153,12 +153,22 @@ for($i=0;$i<$lookup_loop;$i++)
 				else{
 					$guid = "";
 				}
+
+				if(isset($one["lang"])){
+					$language = $one["lang"];
+				}
+				else if(isset($one["language"])){
+					$language = $one["language"];
+				}
+				else{
+					$language = "en";
+				}
 				$pali = $one["pali"];
 				$dict_word_spell["{$pali}"]=1;
 				$type = $one["type"];
 				$gramma = $one["gramma"];
 				$parent = $one["parent"];
-				if(inLangSetting($one["lang"],$user_setting["dict.lang"])){
+				if(inLangSetting($language,$user_setting["dict.lang"])){
 					$mean = $one["mean"];
 				}
 				else{
@@ -191,7 +201,7 @@ for($i=0;$i<$lookup_loop;$i++)
 				else{
 					$partmean = "";
 				}
-				if(inLangSetting($one["lang"],$user_setting["dict.lang"])==false){
+				if(inLangSetting($language,$user_setting["dict.lang"])==false){
 					$partmean = "";
 				}
 				if(isset($one["part_id"])){
@@ -215,12 +225,6 @@ for($i=0;$i<$lookup_loop;$i++)
 					$dict_name = "";
 				}
 
-				if(isset($one["language"])){
-					$language = $one["language"];
-				}
-				else{
-					$language = "en";
-				}
 				
 				array_push($output,array(
 										"id"=>$id,