2016/05/09 00:13:58

Masahiko-Ito · May 8, 2016 · 119c98d · 119c98d
1 parent 014e7d1
commit 119c98d
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 58 deletions.
diff --git a/CHANGES b/CHANGES
@@ -6,3 +6,7 @@ o 2006/10/19 Ver. 0.3
   - README��nkf�����Ѥ��Ƥ�����ɵ���
   - README��fetchmail�˴ؤ��뵭���ɵ���
   - ������ʸ�������᡼��Υ����������0�ˤʤäƤ����Τ�����
+o 2006/10/24 Ver. 0.4
+  - sf_check.sh���select̿���ľ����
+  - sf_add.sh, sf_del.sh, sf_check.sh ������ñ��˴ؤ������
+    �����礬���ä��Τ�����
diff --git a/README b/README
@@ -1,5 +1,5 @@
 
-                  sf-0.3 -- spam filter for UNIX-like systems
+                  sf-0.4 -- spam filter for UNIX-like systems
 
 Copyright (C) 2006 Masahiko Ito
 
@@ -30,6 +30,10 @@ History
   - README��nkf�����Ѥ��Ƥ�����ɵ���
   - README��fetchmail�˴ؤ��뵭���ɵ���
   - ������ʸ�������᡼��Υ����������0�ˤʤäƤ����Τ�����
+ �� 2006/10/24 Ver. 0.4 released
+  - sf_check.sh���select̿���ľ����
+  - sf_add.sh, sf_del.sh, sf_check.sh ������ñ��˴ؤ������
+    �����礬���ä��Τ�����
 
 What's this ?
 =============
@@ -43,17 +47,18 @@ What's this ?
 Preinstall
 ==========
 
-sf-0.3�ϡ��ʲ��Υ��եȥ����������Ѥ��Ƥ��ޤ��������˥��󥹥ȡ��뤬ɬ�פǤ���
+sf-0.4�ϡ��ʲ��Υ��եȥ����������Ѥ��Ƥ��ޤ��������˥��󥹥ȡ��뤬ɬ�פǤ���
 
  �� KAKASI - ����������(�����޻�)�Ѵ��ץ������ (http://kakasi.namazu.org/)
  �� SQLite home page (http://www.sqlite.org/)
  �� nkf Network Kanji Filter (http://sourceforge.jp/projects/nkf/)
+ �� GNU Textutils - Text utilities (http://www.gnu.org/software/textutils/textutils.html)
 
 Install
 =======
 
- �� tar xvzf sf-0.3.tar.gz
- �� cd sf-0.3
+ �� tar xvzf sf-0.4.tar.gz
+ �� cd sf-0.4
  �� cp sf-*.sh /anywhere/bin/
  �� mkdir ~/.sf
 

diff --git a/sf_add.sh b/sf_add.sh
@@ -68,28 +68,22 @@ then
 	exit 0
 fi
 #
+echo "begin;" >/tmp/sf_add.1.$$.tmp
+#
 for i in `cat ${file} |\
 	nkf -e -X |\
 	kakasi -w -ieuc -oeuc |\
 	sed -e "s/${zsp}/ /g;s/${tab}/ /g" |\
 	awk '{gsub(/ /,"\n");print}' |\
-	awk 'BEGIN{ \
-		maxlength = ENVIRON["maxlength"]; \
-	} \
-	{ \
-		if (length($0) <= maxlength){ \
-			print; \
-		} \
+	awk 'BEGIN{\
+		maxlength = ENVIRON["maxlength"];\
+	}\
+	{\
+		if (length($0) <= maxlength){\
+			print;\
+		}\
 	}' |\
-	tr -d '"'`
-do
-	echo -n $i | tr -d '[:cntrl:]'
-	echo ""
-done >/tmp/sf_add.1.$$.tmp
-#
-echo "begin;" >/tmp/sf_add.2.$$.tmp
-#
-for i in `cat /tmp/sf_add.1.$$.tmp |\
+	tr -d '"\000-\011\013-\037\177' |\
 	sort |\
 	uniq -c |\
 	sed -e "s/^ *//;s/${tab}/,/"`
@@ -104,15 +98,15 @@ do
 			sqlite3 ${SFDB_PATH}`
 		if [ "X${result}" = "X" ]
 		then
-			echo "insert into ${table} values (\"${term}\",${count});" >>/tmp/sf_add.2.$$.tmp
+			echo "insert into ${table} values (\"${term}\",${count});" >>/tmp/sf_add.1.$$.tmp
 		else
-			echo "update ${table} set count=count+${count} where term=\"${term}\"; " >>/tmp/sf_add.2.$$.tmp
+			echo "update ${table} set count=count+${count} where term=\"${term}\"; " >>/tmp/sf_add.1.$$.tmp
 		fi
 	fi
 done
 #
-echo "end;" >>/tmp/sf_add.2.$$.tmp
-cat /tmp/sf_add.2.$$.tmp |\
+echo "end;" >>/tmp/sf_add.1.$$.tmp
+cat /tmp/sf_add.1.$$.tmp |\
 sqlite3 ${SFDB_PATH}
 #
 result=`echo "select sum(count) from ${table};" |\

diff --git a/sf_check.sh b/sf_check.sh
@@ -65,6 +65,15 @@ then
 	exit 0
 fi
 #
+echo ".separator \"\t\"" >/tmp/sf_check.1.$$.tmp
+echo "begin;" >>/tmp/sf_check.1.$$.tmp
+echo "select tablenm,count from t_total where tablenm=\"t_white\";" >>/tmp/sf_check.1.$$.tmp
+echo "select tablenm,count from t_total where tablenm=\"t_black\";" >>/tmp/sf_check.1.$$.tmp
+echo "end;" >>/tmp/sf_check.1.$$.tmp
+#
+echo ".separator \"\t\"" >/tmp/sf_check.2.$$.tmp
+echo "begin;" >>/tmp/sf_check.2.$$.tmp
+#
 for i in `cat ${file} |\
 	nkf -e -X |\
 	kakasi -w -ieuc -oeuc |\
@@ -78,22 +87,7 @@ for i in `cat ${file} |\
 			print; \
 		} \
 	}' |\
-	tr -d '"'`
-do
-	echo -n $i | tr -d '[:cntrl:]'
-	echo ""
-done >/tmp/sf_check.1.$$.tmp
-#
-echo ".separator \"\t\"" >/tmp/sf_check.2.$$.tmp
-echo "begin;" >>/tmp/sf_check.2.$$.tmp
-echo "select tablenm,count from t_total where tablenm=\"t_white\";" >>/tmp/sf_check.2.$$.tmp
-echo "select tablenm,count from t_total where tablenm=\"t_black\";" >>/tmp/sf_check.2.$$.tmp
-echo "end;" >>/tmp/sf_check.2.$$.tmp
-#
-echo ".separator \"\t\"" >/tmp/sf_check.3.$$.tmp
-echo "begin;" >>/tmp/sf_check.3.$$.tmp
-#
-for i in `cat /tmp/sf_check.1.$$.tmp |\
+	tr -d '"\000-\011\013-\037\177' |\
 	sort |\
 	uniq -c |\
 	sed -e "s/^ *//;s/${tab}/,/"`
@@ -105,18 +99,18 @@ do
 	then
 		: # do nothing
 	else
-		echo "select t_white.term,t_white.count*${count},t_black.count*${count} from t_white left join t_black on t_white.term = t_black.term where t_white.term=\"${term}\";" >>/tmp/sf_check.3.$$.tmp
-		echo "select t_black.term,t_white.count*${count},t_black.count*${count} from t_black left join t_white on t_white.term = t_black.term where t_black.term=\"${term}\";" >>/tmp/sf_check.3.$$.tmp
+		echo "select t_white.term,t_white.count*${count},t_black.count*${count} from t_white left join t_black on t_white.term = t_black.term where t_white.term=\"${term}\";" >>/tmp/sf_check.2.$$.tmp
+		echo "select t_black.term,t_white.count*${count},t_black.count*${count} from t_black left join t_white on t_white.term = t_black.term where t_black.term=\"${term}\" and t_white.term is NULL;" >>/tmp/sf_check.2.$$.tmp
 	fi
 done
 #
-echo "end;" >>/tmp/sf_check.3.$$.tmp
+echo "end;" >>/tmp/sf_check.2.$$.tmp
 #
 (
-	cat /tmp/sf_check.2.$$.tmp |\
+	cat /tmp/sf_check.1.$$.tmp |\
 	sqlite3 ${SFDB_PATH}
 #
-	cat /tmp/sf_check.3.$$.tmp |\
+	cat /tmp/sf_check.2.$$.tmp |\
 	sqlite3 ${SFDB_PATH} |\
 	sort |\
 	uniq

diff --git a/sf_del.sh b/sf_del.sh
@@ -68,6 +68,8 @@ then
 	exit 0
 fi
 #
+echo "begin;" >/tmp/sf_del.1.$$.tmp
+#
 for i in `cat ${file} |\
 	nkf -e -X |\
 	kakasi -w -ieuc -oeuc |\
@@ -81,15 +83,7 @@ for i in `cat ${file} |\
 			print; \
 		} \
 	}' |\
-	tr -d '"'`
-do
-	echo -n $i | tr -d '[:cntrl:]'
-	echo ""
-done >/tmp/sf_del.1.$$.tmp
-#
-echo "begin;" >/tmp/sf_del.2.$$.tmp
-#
-for i in `cat /tmp/sf_del.1.$$.tmp |\
+	tr -d '"\000-\011\013-\037\177' |\
 	sort |\
 	uniq -c |\
 	sed -e "s/^ *//;s/${tab}/,/"`
@@ -108,16 +102,16 @@ do
 		else
 			if [ ${result} -le ${count} ]
 			then
-				echo "delete from ${table} where term=\"${term}\"; " >>/tmp/sf_del.2.$$.tmp
+				echo "delete from ${table} where term=\"${term}\"; " >>/tmp/sf_del.1.$$.tmp
 			else
-				echo "update ${table} set count=count-${count} where term=\"${term}\"; " >>/tmp/sf_del.2.$$.tmp
+				echo "update ${table} set count=count-${count} where term=\"${term}\"; " >>/tmp/sf_del.1.$$.tmp
 			fi
 		fi
 	fi
 done
 #
-echo "end;" >>/tmp/sf_del.2.$$.tmp
-cat /tmp/sf_del.2.$$.tmp |\
+echo "end;" >>/tmp/sf_del.1.$$.tmp
+cat /tmp/sf_del.1.$$.tmp |\
 sqlite3 ${SFDB_PATH}
 #
 result=`echo "select sum(count) from ${table};" |\