From 2f8bb5045a5fb37d746d045d5438a1f26955e92c Mon Sep 17 00:00:00 2001 From: neal1991 Date: Sat, 18 Nov 2017 21:02:54 +0800 Subject: [PATCH] add path query --- .../main/java/constants/CommonConstants.java | 4 +--- search/src/main/java/index/BaseIndex.java | 2 +- .../src/main/java/search/SearchedResult.java | 2 +- .../classes/constants/CommonConstants.class | Bin 1260 -> 1206 bytes search/target/classes/index/BaseIndex.class | Bin 4066 -> 4017 bytes search/target/classes/search/SearchUtil.class | Bin 6779 -> 6779 bytes .../classes/search/SearchedResult.class | Bin 1247 -> 940 bytes ui/src/main/java/controller/Controller.java | 2 ++ 8 files changed, 5 insertions(+), 5 deletions(-) diff --git a/search/src/main/java/constants/CommonConstants.java b/search/src/main/java/constants/CommonConstants.java index f10d092..455b931 100644 --- a/search/src/main/java/constants/CommonConstants.java +++ b/search/src/main/java/constants/CommonConstants.java @@ -11,9 +11,7 @@ public class CommonConstants { public static List DOCFILES = new ArrayList(Arrays.asList( "doc", "docx", "xls", "xlsx", "pdf", "txt" )); - public static List EXCLUDE_FILE_PATHS = new ArrayList(Arrays.asList( - "node_modules" - )); + public static List EXCLUDE_FILE_PATHS; public static boolean IS_OPEN_CONTEXT = true; public static String INDEX_FILE_PATH = "index"; public static String TOTAL_FILE_NUM; diff --git a/search/src/main/java/index/BaseIndex.java b/search/src/main/java/index/BaseIndex.java index fd119e6..029e47b 100644 --- a/search/src/main/java/index/BaseIndex.java +++ b/search/src/main/java/index/BaseIndex.java @@ -21,7 +21,7 @@ private static void indexDocs(IndexWriter writer, List t) throws Excep private static void indexDoc(IndexWriter writer, FileBean t) throws Exception { Document doc = new Document(); if (t.getContent() != null) { - doc.add(new StringField(LuceneConstants.PATH, t.getFilepath(), Field.Store.YES)); + doc.add(new TextField(LuceneConstants.PATH, t.getFilepath(), Field.Store.YES)); doc.add(new LongPoint(LuceneConstants.MODIFIED, t.getLastModified())); doc.add(new TextField(LuceneConstants.CONTENT, t.getContent(), CommonConstants.IS_OPEN_CONTEXT ? Field.Store.YES : Field.Store.NO)); System.out.println("added to document:" + t.getFilepath()); diff --git a/search/src/main/java/search/SearchedResult.java b/search/src/main/java/search/SearchedResult.java index c3f369a..9c95b6a 100644 --- a/search/src/main/java/search/SearchedResult.java +++ b/search/src/main/java/search/SearchedResult.java @@ -31,5 +31,5 @@ public String getContext() { public void setContext(String context) { this.context = context; } - + } diff --git a/search/target/classes/constants/CommonConstants.class b/search/target/classes/constants/CommonConstants.class index 3509a5d085c3ef91c4a65359e1def6097f8098f0..a9c59a9b7750722ecd5b715fb7f7390297c5b7e7 100644 GIT binary patch delta 502 zcmZ9JM^5ZO6h%*&;Br$W6C3z6IW*AZ_{llP6(G@|mH-K10V7z1SAr~o#DE1bVGAsP zH6UIY^atOAck0%C^=_5?={~b=esx5R9j&mV8*!x;$*@xSnPp7kGfM?aRI*N$bPb8`F#HX}pgB!{1+j0OP#zILkziJ2~!Z?rH98 z9%vqFCN)zY(>(HUcKUw{PcR*`G zTQ=d8-=5In`w5+XKB3DmBy{_y6V6znl1CsTX{oIuY@)8Q G;r1WMFiAQ9 diff --git a/search/target/classes/index/BaseIndex.class b/search/target/classes/index/BaseIndex.class index 6966775c4489466d8e38134a73eaa33236a050b0..89b939d9ddfa7872fb0116a61c8341e4616be6a9 100644 GIT binary patch delta 1370 zcmZ9M`CC+F6vsbz<__=7p3L$Tkj z^_&SFkd~wyg{yepJu4$4`@Avf-Ajzx(n4r&hbf?}WMMPAap%qtebO}*QCqD?|p z_QVsKCYmk6?r)y3Pcy`@J7h0#E9~&hR~eSbnj;+5M0s6vjHFm+xx4Mcd2jHhLEo}a z-F=DvoLkVrktbsr zq+XB)LGtnZjZ$3pmmFUyfT{0tt`NyXqok8-5~<1^(=CHeXTi*hG=UU_hYg*UBrio# zhUsa}Nl`pbs53)JL1~&Y@e2w|bAFmxku>FLW~Z2Q3>{gR=7NqSg^_W>odw!>W|%AJ zg&k%D-s}h>k{b%~Q^a(NrHzogD;OI5zgZZbYH?T^S}Jw>ImDH;NWBemwh?=RwRja* zDOM?3@d@#>Odds>JQL!XW6nFvtXRFIAZI86)-c#^h7Z3JaevNo$0c z8eqBP4GUy=o!n517;LKD)U>VH`K*utWrD2bY6&oRN?J4}t&-Y})ixc-w@$c65VJJ7 zt72^RVr!6hF=|3;@+hvAkzy&?f*H$xxeQQo%;9q380)a zHcMy=u!$Q3+{Dd>v@340DWyZP*+$W3lSWjrMX}Y#tw!tgvyJUGHeDv-Hbu-wxAFAY z%;9!Lua6ym`nbbH_S?*(%g;^*6nENe3eo1{E}Ia$47uCp9tLfO*ln|id;Q$U{YHI2 z@u1B@9x}?qCf_4AdwJBf_n5KmGvsl_6E-D0so1Z0YWPfpHOH~AYX&-^J$;?su^o!1 zorr59{eX-nQz@QN9CWn1HgHJJDxS9}EOP#|@|;0;en}Y-#UafLyr^(AFY&VGFt1po zZ|UrcmevYc6K#)auB6VHa2I)B<%q>1=d?TIZSL#sjBRzYJ>jg^I3i^8SkFG2Pi@Dp{``b%9yG!dDr#GqjnaD_QTEAueGV+Iazsve{WS3vN zno0#n=I6nZ^bw&;MJp9<2~P`;VhxMn63l@&WlU$8$a*S(<*X3RHcjAWsq9~ekkzA~m2INjflI|^MudW@M*P4-8oW!4C{y{@$#qlP{8YP%yc7p72Lan3Z zWSpPm0*Ol(mLxaHf^d?&B>4#nj-tbhlN7eZ$qbLPur))Q$Wa!F^}-gj7k6qeVJQ!p z_?XXmWXU8!r!hS^WcFm{MNs(vl!s-eN@?B4b6mwbY1vFygJ+TrxE1w^2E}^Pg!rhG zN6{$Hq(shed(UwznpR}Y*o$AX4P7m@%|iCc*)*xrY}F?ya*uIQeQ|hj!f$%HF#>~8o`LU@(rnt&P0pxRg2H; zb2(~KdU7eQm6c*Cu3IbrrYYVsDFE}R+9{`^B^BWPORnWyWVK4E>r(}9kP9=gcFBkF Qb)KyX%E#_APF4l~10Bl!>Hq)$ diff --git a/search/target/classes/search/SearchUtil.class b/search/target/classes/search/SearchUtil.class index 9db6d4980ef186ad14dfad3da2a220ab1fdc6810..b31be90159b6db9e0bf5e620690263f229669abc 100644 GIT binary patch delta 206 zcmWNKOG^TA97WIUS_Oh*3CTDAV`~VJF8$^_%Vd} z5PhiG_}g7L_uLz*P@R;n-*ZPAMGlh;MY5F1`?mg{G`Yayng?zv3AcnkN~%bsN{w2O zjooO4XQ|bR@IsshDVpT5MS8`d&6+nhblB2oN0%RZ{PG@nSH4ysi0W|3kSHS(jOA$} jPg94Aif{2jIbo&9F!H#-lHzwZH@;wXTJ{Z*{sfX!<*Z+sm3=m=CVb)v4NnFy>$ zSMs~;Co&!P2PW6)_?^%6T?Y0`*9z z>eKYwP~~6cFrmnLl*KZ+kh$jjELbrUT?lMNg_3zZ=?_Y$MqgAhO$@cIjg|TEOxEfi z+t_NwzoK^ce+`q>sZ_KuM4j>$BLQj7pC$|Fd43sW(>zwpBCxT@`Ii4HL=9mGAJq`6 zYywmT+Sb7Y8uKsyJiJn|L5H^C(Vkp5T!c;z*C{=fBJYF#10mTpy7kEm@+-YNh+n1b z6-_{zJc?T9v#e+Lu+yi?OE~}sU6DkdMCGV=BCn$1=#a6{NBZvTp_1v4d2WK@JI| P^8yHOmO*yQ9qj!978{G( literal 1247 zcmaKqOK;Oa5Xb-PIC0|`64LYmv^0Ig7% zc4Z(f_K8B@dUNGLd1|k`z)Ow=DrWCgKs^aZQlM#jfqXYRAIj*XGxW*QwnNwPPo2o) zduCLVsTT`u*s*jXcWMn%B}X4*Jo6LE-k8Yb^`eoE*(+anb3HdH zE^pDv=j3V-Iz2Bg2E8oW7TC*3ZXJz532wyf&%tg9VN87x&LUTG(*mpcfjs9u8n}z5 zffdvZ=qws64BQb|D;=Xi>w5q1hiB4FuuES>qo1Tg;Y@T=I9aMGU#cl3={f`#B-x^y zMOu)q_J2ZrOWp2~tj&#R)7i+*tLV^;ps-FdAN(E4*FtcsGS@1CtDqO1nW+e<)rzzp)R6htk8bW1_D z%0bj3$N_;IE&<^UGsrd`ku0vJS_CmmL3Ys1f^(~>7D1j8$g?FN{KXh#H~kEI{{VZb B$GQLj diff --git a/ui/src/main/java/controller/Controller.java b/ui/src/main/java/controller/Controller.java index 6dd08f3..e09dc78 100644 --- a/ui/src/main/java/controller/Controller.java +++ b/ui/src/main/java/controller/Controller.java @@ -1,6 +1,7 @@ package controller; import client.ClientWindow; +import constants.CommonConstants; import constants.LuceneConstants; import index.IndexUtil; import javafx.application.ConditionalFeature; @@ -80,6 +81,7 @@ protected Void call() throws Exception { private void executeIndex() { ConfigSetting configSetting = ConfigController.readConfig(); + CommonConstants.EXCLUDE_FILE_PATHS = configSetting.getExcludeFilePathList(); IndexUtil.executeIndex(configSetting.getSearchMethod()); if (configSetting.getHasCreateIndex() == false) { configSetting.setHasCreateIndex(true);