From becd32b1784a0e9bb3acf23c9f2ef418f406608e Mon Sep 17 00:00:00 2001 From: "miao.lin" Date: Wed, 3 Jul 2013 17:32:35 +0800 Subject: [PATCH 01/11] =?UTF-8?q?made=20test=5Fwhoosh.py=20happy.=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AAtmp=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=A5=BD=E8=AE=A9test=5Fwhoosh.py=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp | 0 test/tmp/MAIN_WRITELOCK | 0 test/tmp/MAIN_c1dnm795oe82q31l.seg | Bin 0 -> 12643 bytes test/tmp/MAIN_sq8nl68wxii4xqpx.pst | 0 test/tmp/MAIN_sq8nl68wxii4xqpx.trm | Bin 0 -> 13 bytes test/tmp/_MAIN_0.toc | Bin 0 -> 1427 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/tmp/MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp create mode 100755 test/tmp/MAIN_WRITELOCK create mode 100644 test/tmp/MAIN_c1dnm795oe82q31l.seg create mode 100644 test/tmp/MAIN_sq8nl68wxii4xqpx.pst create mode 100644 test/tmp/MAIN_sq8nl68wxii4xqpx.trm create mode 100644 test/tmp/_MAIN_0.toc diff --git a/test/tmp/MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp b/test/tmp/MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp new file mode 100644 index 0000000..e69de29 diff --git a/test/tmp/MAIN_WRITELOCK b/test/tmp/MAIN_WRITELOCK new file mode 100755 index 0000000..e69de29 diff --git a/test/tmp/MAIN_c1dnm795oe82q31l.seg b/test/tmp/MAIN_c1dnm795oe82q31l.seg new file mode 100644 index 0000000000000000000000000000000000000000..53290fa9203bab6ac6956e5df1a93a85525e0887 GIT binary patch literal 12643 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 literal 0 HcmV?d00001 diff --git a/test/tmp/MAIN_sq8nl68wxii4xqpx.pst b/test/tmp/MAIN_sq8nl68wxii4xqpx.pst new file mode 100644 index 0000000..e69de29 diff --git a/test/tmp/MAIN_sq8nl68wxii4xqpx.trm b/test/tmp/MAIN_sq8nl68wxii4xqpx.trm new file mode 100644 index 0000000000000000000000000000000000000000..67ed720b49262d7c83b1dd2f494b8e64ac289f7f GIT binary patch literal 13 NcmeYW_Aq9E0RRlI0T%!O literal 0 HcmV?d00001 diff --git a/test/tmp/_MAIN_0.toc b/test/tmp/_MAIN_0.toc new file mode 100644 index 0000000000000000000000000000000000000000..6f1827a2b8a17c51959f27d410a5cac670afa31b GIT binary patch literal 1427 zcmZ{kTXWk)6vq?!lCUXI?srJbO=-cHDlq3rQ5`-kLbJWU`|5_=w17gYy zbetJp;E|8Q7vPaE0mCaVJewoQ4jBS^Sj`@t|GDh`j>^;J;qcdAhQr|xMrGnJamR4G z6o#5=El>GPE!JI9ZChY+?i&~>N~WB$icct~sPNVegIEPIs{c}MEN^ZIOtEe{#XY8+ zaYH|82UgtgD2Rrvw!)}w$Cx?L<$En|hT4n0Fwg?WSbcAb`&gYPwH&T3#{Dbve@^6& zoC-U+FOH{)Bd6`a_WOG(!UN-|xkY=rHvXi=V%Y9vIn=_)Ti`)X^iYb2WrfXcjYqce zsOjGFlw%h{tquZ+Me+ir)kb(*1s*38c#P$br+C6SlC|aev5K^~5q4GN+FD)B4FXTH zyueaBXyV1q5}({3KYg3OfBX5aG(3%$c#ZM0H0%H-uNrf_#yBO*WbZ1R z=I;Ssk)^(h@hWdxsL3*CXyY|m;+w?lvfL#V;EXh!KF&%b4snkC!vyEqq;NqRU4@IX z91{n=lr_@F<-CgDfBasSf-uG#9K?$WZ^}~aH1U?4w51UScw3e^P=t3fHJAG?TU(fy zMxyavrty6&$db#|UtuXJEV4(0CGI&=SXSSy;VNh39#-m;iKDb5kGB&(s5rYs3yF&Q zxF)BXs%5hotFp>R8mT6(4`g*$xx7K0PhEGE?|Z=xZtU~M4I|s}72Y2(eC3YKr8mY1 zj0R|RN#Fy%y_+dMG)Xk*2=B{1PxA!1N??s0*Hdhm^bg{ckxfT=&MVLG(_(e$5Q~yy ze3as2hprEZtE?u0$Ngb*pKGje$6W6xl+ER*DLyMoqHNH%Qf&W6V#;RY^Ar~GP<&yI z+dG)6Lv^gF9o0Kjip@$Vg=@<4j?H{F_oYz1PNcNv`G#^MB`lYx(et_amOQrAJ#B8) z=J_>u3On`LyK5kBKAROU#Vv=jIk=s|H)*y(CkAwq81425?I1@v%u()8fiZH7BPsya zRInS5*i8y{cj*kBrE_$iF3?4~M3)O1yCWKVbO2(X#t80Ff!~+3Kv$^1?JLSjOKGKU p{jFLpoSj~Pg{)c|ecUvodWfK#3jBQNT{sui0?w Date: Wed, 3 Jul 2013 17:55:01 +0800 Subject: [PATCH 02/11] clean the files in tmp --- .../MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp | 0 test/tmp/MAIN_WRITELOCK | 0 test/tmp/MAIN_c1dnm795oe82q31l.seg | Bin 12643 -> 0 bytes test/tmp/MAIN_sq8nl68wxii4xqpx.pst | 0 test/tmp/MAIN_sq8nl68wxii4xqpx.trm | Bin 13 -> 0 bytes test/tmp/_MAIN_0.toc | Bin 1427 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test/tmp/MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp delete mode 100755 test/tmp/MAIN_WRITELOCK delete mode 100644 test/tmp/MAIN_c1dnm795oe82q31l.seg delete mode 100644 test/tmp/MAIN_sq8nl68wxii4xqpx.pst delete mode 100644 test/tmp/MAIN_sq8nl68wxii4xqpx.trm delete mode 100644 test/tmp/_MAIN_0.toc diff --git a/test/tmp/MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp b/test/tmp/MAIN.tmp/72xv2skz6q945md0dw19f4g1vrff.ctmp deleted file mode 100644 index e69de29..0000000 diff --git a/test/tmp/MAIN_WRITELOCK b/test/tmp/MAIN_WRITELOCK deleted file mode 100755 index e69de29..0000000 diff --git a/test/tmp/MAIN_c1dnm795oe82q31l.seg b/test/tmp/MAIN_c1dnm795oe82q31l.seg deleted file mode 100644 index 53290fa9203bab6ac6956e5df1a93a85525e0887..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12643 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 diff --git a/test/tmp/MAIN_sq8nl68wxii4xqpx.pst b/test/tmp/MAIN_sq8nl68wxii4xqpx.pst deleted file mode 100644 index e69de29..0000000 diff --git a/test/tmp/MAIN_sq8nl68wxii4xqpx.trm b/test/tmp/MAIN_sq8nl68wxii4xqpx.trm deleted file mode 100644 index 67ed720b49262d7c83b1dd2f494b8e64ac289f7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13 NcmeYW_Aq9E0RRlI0T%!O diff --git a/test/tmp/_MAIN_0.toc b/test/tmp/_MAIN_0.toc deleted file mode 100644 index 6f1827a2b8a17c51959f27d410a5cac670afa31b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1427 zcmZ{kTXWk)6vq?!lCUXI?srJbO=-cHDlq3rQ5`-kLbJWU`|5_=w17gYy zbetJp;E|8Q7vPaE0mCaVJewoQ4jBS^Sj`@t|GDh`j>^;J;qcdAhQr|xMrGnJamR4G z6o#5=El>GPE!JI9ZChY+?i&~>N~WB$icct~sPNVegIEPIs{c}MEN^ZIOtEe{#XY8+ zaYH|82UgtgD2Rrvw!)}w$Cx?L<$En|hT4n0Fwg?WSbcAb`&gYPwH&T3#{Dbve@^6& zoC-U+FOH{)Bd6`a_WOG(!UN-|xkY=rHvXi=V%Y9vIn=_)Ti`)X^iYb2WrfXcjYqce zsOjGFlw%h{tquZ+Me+ir)kb(*1s*38c#P$br+C6SlC|aev5K^~5q4GN+FD)B4FXTH zyueaBXyV1q5}({3KYg3OfBX5aG(3%$c#ZM0H0%H-uNrf_#yBO*WbZ1R z=I;Ssk)^(h@hWdxsL3*CXyY|m;+w?lvfL#V;EXh!KF&%b4snkC!vyEqq;NqRU4@IX z91{n=lr_@F<-CgDfBasSf-uG#9K?$WZ^}~aH1U?4w51UScw3e^P=t3fHJAG?TU(fy zMxyavrty6&$db#|UtuXJEV4(0CGI&=SXSSy;VNh39#-m;iKDb5kGB&(s5rYs3yF&Q zxF)BXs%5hotFp>R8mT6(4`g*$xx7K0PhEGE?|Z=xZtU~M4I|s}72Y2(eC3YKr8mY1 zj0R|RN#Fy%y_+dMG)Xk*2=B{1PxA!1N??s0*Hdhm^bg{ckxfT=&MVLG(_(e$5Q~yy ze3as2hprEZtE?u0$Ngb*pKGje$6W6xl+ER*DLyMoqHNH%Qf&W6V#;RY^Ar~GP<&yI z+dG)6Lv^gF9o0Kjip@$Vg=@<4j?H{F_oYz1PNcNv`G#^MB`lYx(et_amOQrAJ#B8) z=J_>u3On`LyK5kBKAROU#Vv=jIk=s|H)*y(CkAwq81425?I1@v%u()8fiZH7BPsya zRInS5*i8y{cj*kBrE_$iF3?4~M3)O1yCWKVbO2(X#t80Ff!~+3Kv$^1?JLSjOKGKU p{jFLpoSj~Pg{)c|ecUvodWfK#3jBQNT{sui0?w Date: Wed, 3 Jul 2013 17:56:15 +0800 Subject: [PATCH 03/11] add test/tmp/* into git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 90f38e8..d5e1f8e 100644 --- a/.gitignore +++ b/.gitignore @@ -162,4 +162,5 @@ pip-log.txt # Mac crap .DS_Store *.log +test/tmp/* From ba5114dc95a0a49018023966bf4987e771051c9b Mon Sep 17 00:00:00 2001 From: Sun Junyi Date: Thu, 4 Jul 2013 09:31:09 +0800 Subject: [PATCH 04/11] update whoosh example --- test/test_whoosh.py | 5 ++++- test/test_whoosh_flie.py | 3 +++ test/test_whoosh_flie_read.py | 27 +++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 test/test_whoosh_flie_read.py diff --git a/test/test_whoosh.py b/test/test_whoosh.py index bb2fda6..1d7f747 100644 --- a/test/test_whoosh.py +++ b/test/test_whoosh.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -import sys +import sys,os sys.path.append("../") from whoosh.index import create_in,open_dir from whoosh.fields import * @@ -10,6 +10,9 @@ from jieba.analyse import ChineseAnalyzer analyzer = ChineseAnalyzer() schema = Schema(title=TEXT(stored=True), path=ID(stored=True), content=TEXT(stored=True, analyzer=analyzer)) +if not os.path.exists("tmp"): + os.mkdir("tmp") + ix = create_in("tmp", schema) # for create new index #ix = open_dir("tmp") # for read only writer = ix.writer() diff --git a/test/test_whoosh_flie.py b/test/test_whoosh_flie.py index c843d6b..3610b49 100644 --- a/test/test_whoosh_flie.py +++ b/test/test_whoosh_flie.py @@ -1,5 +1,6 @@ # -*- coding: UTF-8 -*- import sys +import os sys.path.append("../") from whoosh.index import create_in from whoosh.fields import * @@ -10,6 +11,8 @@ from jieba.analyse import ChineseAnalyzer analyzer = ChineseAnalyzer() schema = Schema(title=TEXT(stored=True), path=ID(stored=True), content=TEXT(stored=True, analyzer=analyzer)) +if not os.path.exists("tmp"): + os.mkdir("tmp") ix = create_in("tmp", schema) writer = ix.writer() diff --git a/test/test_whoosh_flie_read.py b/test/test_whoosh_flie_read.py new file mode 100644 index 0000000..4528ae4 --- /dev/null +++ b/test/test_whoosh_flie_read.py @@ -0,0 +1,27 @@ +# -*- coding: UTF-8 -*- +import sys +import os +sys.path.append("../") +from whoosh.index import create_in,open_dir +from whoosh.fields import * +from whoosh.qparser import QueryParser + +from jieba.analyse import ChineseAnalyzer + +analyzer = ChineseAnalyzer() + +schema = Schema(title=TEXT(stored=True), path=ID(stored=True), content=TEXT(stored=True, analyzer=analyzer)) +if not os.path.exists("tmp"): + os.mkdir("tmp") +ix = open_dir("tmp") + +searcher = ix.searcher() +parser = QueryParser("content", schema=ix.schema) + +for keyword in (u"水果小姐",u"你",u"first",u"中文",u"交换机",u"交换",u"少林",u"乔峰"): + print "result of ",keyword + q = parser.parse(keyword) + results = searcher.search(q) + for hit in results: + print hit.highlights("content") + print "="*10 From 9d0ea771a51277d9bd957079a228363528993555 Mon Sep 17 00:00:00 2001 From: Sun Junyi Date: Fri, 5 Jul 2013 16:16:49 +0800 Subject: [PATCH 05/11] fix bug; decimals & digit-english mixed --- jieba/finalseg/__init__.py | 2 +- test/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jieba/finalseg/__init__.py b/jieba/finalseg/__init__.py index bf30fe2..177932e 100644 --- a/jieba/finalseg/__init__.py +++ b/jieba/finalseg/__init__.py @@ -58,7 +58,7 @@ def cut(sentence): sentence = sentence.decode('utf-8') except: sentence = sentence.decode('gbk','ignore') - re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5]+)"), re.compile(ur"([\.0-9]+|[a-zA-Z0-9]+)") + re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5]+)"), re.compile(ur"(\d+\.\d+|[a-zA-Z0-9]+)") blocks = re_han.split(sentence) for blk in blocks: if re_han.match(blk): diff --git a/test/test.py b/test/test.py index 868011f..cc43f53 100644 --- a/test/test.py +++ b/test/test.py @@ -97,4 +97,4 @@ if __name__ == "__main__": cuttest('枪杆子中出政权') cuttest('张三风同学走上了不归路') cuttest('阿Q腰间挂着BB机手里拿着大哥大，说：我一般吃饭不AA制的。') - cuttest('在1号店能买到小S和大S八卦的书。') + cuttest('在1号店能买到小S和大S八卦的书，还有3D电视。') From 7bfd432fc59c130b98bc893fb53cf3c07079eaf2 Mon Sep 17 00:00:00 2001 From: Richard Wong Date: Mon, 8 Jul 2013 13:51:39 +0800 Subject: [PATCH 06/11] Remove the unused imports. --- jieba/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jieba/__init__.py b/jieba/__init__.py index 5731a0f..7b710b4 100644 --- a/jieba/__init__.py +++ b/jieba/__init__.py @@ -1,8 +1,7 @@ from __future__ import with_statement import re -import math -import os,sys -import pprint +import os +import sys import finalseg import time import tempfile From fbfaac2eaab5b3fd8e3a90cc44e3d7a6e395df40 Mon Sep 17 00:00:00 2001 From: Richard Wong Date: Mon, 8 Jul 2013 13:54:36 +0800 Subject: [PATCH 07/11] Reindent function * jieba/__init__.py (require_initialized): --- jieba/__init__.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/jieba/__init__.py b/jieba/__init__.py index 7b710b4..d206542 100644 --- a/jieba/__init__.py +++ b/jieba/__init__.py @@ -102,16 +102,18 @@ def initialize(*args): def require_initialized(fn): - global initialized,DICTIONARY - - @wraps(fn) - def wrapped(*args, **kwargs): - if initialized: - return fn(*args, **kwargs) - else: - initialize(DICTIONARY) - return fn(*args, **kwargs) - return wrapped + global initialized,DICTIONARY + + @wraps(fn) + def wrapped(*args, **kwargs): + if initialized: + return fn(*args, **kwargs) + else: + initialize(DICTIONARY) + return fn(*args, **kwargs) + + return wrapped + def __cut_all(sentence): dag = get_DAG(sentence) From 99d2492d679265d2470a955a6ad165e0cc0606a4 Mon Sep 17 00:00:00 2001 From: Richard Wong Date: Wed, 10 Jul 2013 16:22:17 +0800 Subject: [PATCH 08/11] Add re.U flag to re variable. --- jieba/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jieba/__init__.py b/jieba/__init__.py index d206542..469bb1a 100644 --- a/jieba/__init__.py +++ b/jieba/__init__.py @@ -212,9 +212,9 @@ def cut(sentence,cut_all=False): sentence = sentence.decode('utf-8') except UnicodeDecodeError: sentence = sentence.decode('gbk','ignore') - re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5a-zA-Z0-9+#&\._]+)"), re.compile(ur"(\s+)") + re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5a-zA-Z0-9+#&\._]+)", re.U), re.compile(ur"(\s+)", re.U) if cut_all: - re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5]+)"), re.compile(ur"[^a-zA-Z0-9+#\n]") + re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5]+)", re.U), re.compile(ur"[^a-zA-Z0-9+#\n]", re.U) blocks = re_han.split(sentence) cut_block = __cut_DAG if cut_all: From c2ded83ead9e2c9ed195897913f3f481bec96ddf Mon Sep 17 00:00:00 2001 From: Richard Wong Date: Wed, 10 Jul 2013 16:22:49 +0800 Subject: [PATCH 09/11] Refactor: fix line indent to 4. * jieba/__init__.py (cut): --- jieba/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jieba/__init__.py b/jieba/__init__.py index 469bb1a..fe3988c 100644 --- a/jieba/__init__.py +++ b/jieba/__init__.py @@ -221,9 +221,9 @@ def cut(sentence,cut_all=False): cut_block = __cut_all for blk in blocks: if re_han.match(blk): - #pprint.pprint(__cut_DAG(blk)) - for word in cut_block(blk): - yield word + #pprint.pprint(__cut_DAG(blk)) + for word in cut_block(blk): + yield word else: tmp = re_skip.split(blk) for x in tmp: From d63140fe5e0bd5e7003f38040e26ca6533a5faa6 Mon Sep 17 00:00:00 2001 From: Sun Junyi Date: Wed, 10 Jul 2013 17:27:47 +0800 Subject: [PATCH 10/11] make a serial white spaces seperated --- jieba/__init__.py | 2 +- jieba/posseg/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jieba/__init__.py b/jieba/__init__.py index fe3988c..0ee4320 100644 --- a/jieba/__init__.py +++ b/jieba/__init__.py @@ -212,7 +212,7 @@ def cut(sentence,cut_all=False): sentence = sentence.decode('utf-8') except UnicodeDecodeError: sentence = sentence.decode('gbk','ignore') - re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5a-zA-Z0-9+#&\._]+)", re.U), re.compile(ur"(\s+)", re.U) + re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5a-zA-Z0-9+#&\._]+)", re.U), re.compile(ur"(\r\n|\s)", re.U) if cut_all: re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5]+)", re.U), re.compile(ur"[^a-zA-Z0-9+#\n]", re.U) blocks = re_han.split(sentence) diff --git a/jieba/posseg/__init__.py b/jieba/posseg/__init__.py index 70aacf4..69f47da 100644 --- a/jieba/posseg/__init__.py +++ b/jieba/posseg/__init__.py @@ -131,7 +131,7 @@ def __cut_internal(sentence): sentence = sentence.decode('utf-8') except: sentence = sentence.decode('gbk','ignore') - re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5a-zA-Z0-9+#&\._]+)"), re.compile(ur"(\s+)") + re_han, re_skip = re.compile(ur"([\u4E00-\u9FA5a-zA-Z0-9+#&\._]+)"), re.compile(ur"(\r\n|\s)") re_eng,re_num = re.compile(ur"[a-zA-Z0-9]+"), re.compile(ur"[\.0-9]+") blocks = re_han.split(sentence) for blk in blocks: From d691d91674c5557264295babffed9b3671f54b12 Mon Sep 17 00:00:00 2001 From: Sun Junyi Date: Mon, 15 Jul 2013 09:32:52 +0800 Subject: [PATCH 11/11] fix a bug about ImportError --- jieba/analyse/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jieba/analyse/__init__.py b/jieba/analyse/__init__.py index f3d58de..b34fc44 100644 --- a/jieba/analyse/__init__.py +++ b/jieba/analyse/__init__.py @@ -1,6 +1,9 @@ import jieba import os -from analyzer import ChineseAnalyzer +try: + from analyzer import ChineseAnalyzer +except ImportError: + pass _curpath=os.path.normpath( os.path.join( os.getcwd(), os.path.dirname(__file__) ) ) f_name = os.path.join(_curpath,"idf.txt")