From 48df1dfb8575e06ec8be71822df46e3c7cea55b2 Mon Sep 17 00:00:00 2001
From: short <>
Date: Mon, 1 Aug 2005 02:15:23 +0000
Subject: [PATCH] Implemented "pri" priorities.

---
 src/jaxam       |  9 +++++++++
 src/jaxam.edict | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/jaxam b/src/jaxam
index 821d25a..82feb45 100755
--- a/src/jaxam
+++ b/src/jaxam
@@ -71,6 +71,13 @@ sub schedule($$%)
 		# 1/log(2+$age):   0..small importance
 		$sum+=1/log(2+$age)*$ok{$result->{"ok"}};
 		}
+	my $scale=1;
+	if ($r->{"pri"}) {
+		my $abspri=$r->{"pri"};
+		$abspri=1/(-$abspri) if $abspri<0;
+		$abspri=2 if $abspri<2;
+		$scale=log($abspri)*($r->{"pri"}<0 ? -1 : +1);
+	}
 	my $arr=[];
 	if ($T->exists($sum)) {
 		$arr=$T->select($sum)->{"arr"};
@@ -175,6 +182,8 @@ sub edict_line_parse(;$)
 		$r->{"kana"}=$r->{"kanji"};
 		delete $r->{"kanji"};
 	}
+	$rest=~s{^(|.*/)[(]pri([+-]\d+)[)]/}{$1};
+	$r->{"pri"}=$2 if $2;
 	while ($rest) {
 		$rest=~s{^\s*([^/]+?)\s*/}{}
 				or do { warn "Unparsable english: $s\n"; $errors_wait_key_count++; return; };
diff --git a/src/jaxam.edict b/src/jaxam.edict
index 8abf90f..9acbada 100644
--- a/src/jaxam.edict
+++ b/src/jaxam.edict
@@ -12,14 +12,14 @@
 ちゃん /(n) suffix for familiar (female) person/(P)/
 君 [くん] /(n,suf) Mr (junior)/master/boy/(P)/
 人 [じん] /(n) man/person/people/(P)/
-先生 [せんせい] /(n) teacher/master/doctor/(P)/
+先生 [せんせい] /(n) teacher/master/doctor/(P)/(pri-50)/
 教師 [きょうし] /(n) teacher (classroom)/(P)/
 学生 [がくせい] /(n) student/(P)/
 会社員 [かいしゃいん] /(n) company employee/
 社員 [しゃいん] /(n) company employee/(P)/
-銀行員 [ぎんこういん] /(n) bank employee/banker/
-医者 [いしゃ] /(n) doctor (medical)/(P)/
-研究者 [けんきゅうしゃ] /researcher/(P)/
+銀行員 [ぎんこういん] /(n) bank employee/banker/(pri-50)/
+医者 [いしゃ] /(n) doctor (medical)/(P)/(pri-50)/
+研究者 [けんきゅうしゃ] /researcher/(P)/(pri-50)/
 エンジニア /(n) engineer/(P)/
 大学 [だいがく] /(n) university/(P)/
 病院 [びょういん] /(n) hospital/(P)/
@@ -338,7 +338,7 @@
 何方 [どちら] /(n) (uk) which (of two)/who/(P)/
 
 ; page 6, excercise 6
-テープ /(n) tape/(lace)/
+テープ /(n) tape/(lace)/(pri-10)/
 日本 [にほん] /Japan/(P)/
 ; page 6, excercise 7
 八 [はち] /(num) eight/(P)/
@@ -348,7 +348,7 @@
 イギリス /Great Britain (pt: Inglez)/United Kingdom/(P)/
 
 ; page -64- of How to Write Words of Foreign Origin
-練習 [れんしゅう] /(n,vs) practice/(P)/(laceno)/
+練習 [れんしゅう] /(n,vs) practice/(P)/(pri-500)/
 
 ; page 35, excercise 8.3
 形容詞 [けいようし] /(n) "true" adjective/(P)/
-- 
1.8.3.1