visuddhinanda 5 anni fa
parent
commit
72e0c0b0f5
4 ha cambiato i file con 40 aggiunte e 37 eliminazioni
  1. 28 27
      app/dict/function.php
  2. 1 1
      app/dict/index.php
  3. 9 8
      app/reader/index.php
  4. 2 1
      dicttext/system/part.csv

+ 28 - 27
app/dict/function.php

@@ -5,42 +5,43 @@ require_once '../redis/function.php';
 
 function getRefFirstMeaning($word,$lang,$redis){
 	if($redis!==false){
-		/*
-		$mean = $redis->hGet("ref_first_mean://".$lang,$word);
-		if($mean===FALSE){
-			PDO_Connect(_FILE_DB_REF_, _DB_USERNAME_, _DB_PASSWORD_);
-			$query = "SELECT mean,language as lang from " . _TABLE_DICT_REF_ . " where word = ?  group by language";
-			$Fetch = PDO_FetchAll($query, array($word));
-			if(count($Fetch)>0){
-				foreach ($Fetch as $key => $value) {
-					# code...
-					$redis->hSet("ref_first_mean://".$word,$value["lang"],$value["mean"]);
-				}
+		if(mb_substr($word,0,1,"UTF-8")==="["){
+			$ending = "-".mb_substr($word,1,-1,"UTF-8");
+			$mean = $redis->hGet("ref_first_mean://".$lang,$ending);
+			if($mean!=FALSE){
+				return $mean;
 			}
 		}
-		*/
-		$mean = $redis->hGet("ref_first_mean://".$word,$lang);
+		$mean = $redis->hGet("ref_first_mean://".$lang,$word);
 		if($mean!=FALSE){
 			return $mean;
 		}
-		else{
-			if($lang!="en"){
-				$mean = $redis->hGet("ref_first_mean://".$word,"en");
-				if($mean!==FALSE){
-					return $mean;
-				}
-			}
-
-			$any = $redis->hGet("ref_first_mean://com",$word);
-			if($any!==FALSE){
-					# code...
-				return $any;
 
+		if($lang!="en"){
+			$mean = $redis->hGet("ref_first_mean://en",$word);
+			if($mean!==FALSE){
+				return $mean;
 			}
-			else{
-				return "";
+		}
+		#如果没有查规则变形
+		if($redis->hExists("dict://regular/part",$word)===TRUE){
+			$rglPart = explode("+",$redis->hGet("dict://regular/part",$word)) ;
+			$mean = $mean = $redis->hGet("ref_first_mean://".$lang,$rglPart[0]);
+			if($mean!=FALSE){
+				return $mean;
 			}
 		}
+		#查询其他的语言
+		$any = $redis->hGet("ref_first_mean://com",$word);
+		if($any!==FALSE){
+				# code...
+			return $any;
+
+		}
+		else{
+			return "";
+		}
+		
 	}
 	else{
 		PDO_Connect(_FILE_DB_REF_, _DB_USERNAME_, _DB_PASSWORD_);

+ 1 - 1
app/dict/index.php

@@ -136,7 +136,7 @@ if (isset($_GET["key"]) && !empty($_GET["key"])) {
 }
 ?>
 
-window.addEventListener('scroll', winScroll);
+//window.addEventListener('scroll', winScroll);
 
 function winScroll(e) {
 	if (GetPageScroll().y > 150) {

+ 9 - 8
app/reader/index.php

@@ -167,18 +167,19 @@ require_once "../pcdl/html_head.php";
 		background-color: var(--btn-hover-bg-color);
 		
 	}
-	.active a{
-		color:white;
-	}
+
 	.icon_btn a {
 	color: var(--main-color);
 	}
 	.icon_btn:hover a {
 		color: var(--btn-hover-color);
 	}
+	.active a{
+		color:var(--btn-hover-color);
+	}
 	chapter{
 	display:inline-block;
-}
+	}
 
 .language-para {
     padding: 2px 2px;
@@ -233,10 +234,10 @@ require_once "../pcdl/html_head.php";
 
 	#right_float_pannal{
 		position: fixed;
-		height: calc(100% - 7.5em);
-		top: 7.5em;
+		height: calc(100% - 7.3em);
+		top: 7.3em;
 		left: 100%;
-		width: 28em;
+		width: 30em;
 		min-width:20em;
 		color: var(--btn-color);
 		background-color: var(--tool-bg-color);
@@ -253,7 +254,7 @@ require_once "../pcdl/html_head.php";
 	}
 
 	.right_float_min #right_float_pannal{
-		left: calc(100% - 28em);
+		left: calc(100% - 30em);
 	}
 	</style>
 

+ 2 - 1
dicttext/system/part.csv

@@ -217009,4 +217009,5 @@ udayana,11
 āsīvislaya,1
 ādīnaṃ,10
 sa,100
-vasena,100
+vasena,100
+ṃ,100