Skip to content

Commit 28d56d2

Browse files
LucasLazogueLucasLazogue
committed
Delete Logger class and use log4j
1 parent 7923415 commit 28d56d2

File tree

6 files changed

+86
-87
lines changed

6 files changed

+86
-87
lines changed

‎gxflowfulltextsearch/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
<artifactId>poi-ooxml</artifactId>
4343
<version>${poi.version}</version>
4444
</dependency>
45+
<dependency>
46+
<groupId>org.apache.logging.log4j</groupId>
47+
<artifactId>log4j-core</artifactId>
48+
<version>${log4j.version}</version>
49+
</dependency>
4550
</dependencies>
4651

4752
<build>

‎gxflowfulltextsearch/src/main/java/com/genexus/CA/search/AnalyzerManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.apache.lucene.analysis.standard.StandardAnalyzer;
66

77
public class AnalyzerManager {
8-
private static HashMap hash = new HashMap();
8+
private static final HashMap hash = new HashMap();
99

1010
public static Analyzer getAnalyzer(String lang) {
1111
Analyzer analyzer = null;

‎gxflowfulltextsearch/src/main/java/com/genexus/CA/search/IndexManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.HashMap;
44

55
public class IndexManager {
6-
private static HashMap hash = new HashMap();
6+
private static final HashMap hash = new HashMap();
77

88
public static void addContent(String dir, String uri, String lang, String title, String summary, byte fromFile, String body, String filePath) {
99
getIndexer(dir).addContent(uri, lang, title, summary, fromFile, body, filePath);

‎gxflowfulltextsearch/src/main/java/com/genexus/CA/search/Indexer.java‎

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.genexus.CA.search;
22

3-
import java.io.BufferedReader;
43
import java.io.File;
54
import java.io.FileInputStream;
6-
import java.io.FileReader;
75
import java.io.IOException;
86
import java.util.Iterator;
97
import java.util.List;
8+
9+
import org.apache.logging.log4j.Logger;
10+
import org.apache.logging.log4j.LogManager;
1011
import org.apache.lucene.analysis.standard.StandardAnalyzer;
1112
import org.apache.lucene.document.Document;
1213
import org.apache.lucene.document.Field;
@@ -32,6 +33,8 @@ public final class Indexer {
3233
private static final int IDX = 1;
3334
private static final int DLT = 2;
3435

36+
private static final Logger logger = LogManager.getLogger("Indexer.class");
37+
3538
protected Indexer(String directory) {
3639
this.indexDirectory = directory;
3740
if (!this.indexExists(directory)) {
@@ -40,7 +43,7 @@ protected Indexer(String directory) {
4043
IndexWriter writer = new IndexWriter(directory, new StandardAnalyzer(), true);
4144
writer.close();
4245
} catch (Exception var3) {
43-
Logger.print(var3.toString());
46+
logger.error(var3.getMessage(), var3);
4447
}
4548
}
4649

@@ -58,48 +61,40 @@ protected void addContent(String uri, String lang, String title, String summary,
5861
List<XWPFParagraph> data = reader.getParagraphs();
5962

6063
XWPFParagraph p;
61-
for(Iterator var14 = data.iterator(); var14.hasNext(); content = content + p.getText()) {
62-
p = (XWPFParagraph)var14.next();
64+
for(Iterator<XWPFParagraph> var14 = data.iterator(); var14.hasNext(); content = content + p.getText()) {
65+
p = var14.next();
6366
}
6467
} else if (this.isPdfExtension(filePath)) {
6568
PDDocument document = Loader.loadPDF(new File(filePath));
6669
new PDFTextStripperByArea();
6770
PDFTextStripper tStripper = new PDFTextStripper();
6871
content = content + tStripper.getText(document);
69-
} else if (this.isTxtExtension(filePath)) {
70-
File txt = new File(filePath);
71-
72-
String st;
73-
for(BufferedReader br = new BufferedReader(new FileReader(txt)); (st = br.readLine()) != null; content = content + st) {
74-
}
7572
}
7673
} catch (IOException var16) {
7774
var16.printStackTrace();
7875
}
7976
}
8077

81-
if (doc != null) {
82-
if (this.documentExists(uri, lang)) {
83-
this.indexOperation(2, lang, (Document)null, uri.toLowerCase());
84-
}
78+
if (this.documentExists(uri, lang)) {
79+
this.indexOperation(2, lang, (Document) null, uri.toLowerCase());
80+
}
8581

86-
doc.add(new Field("uri", uri, Store.YES, Index.UN_TOKENIZED));
87-
doc.add(new Field("content", content, Store.YES, Index.TOKENIZED));
82+
doc.add(new Field("uri", uri, Store.YES, Index.UN_TOKENIZED));
83+
doc.add(new Field("content", content, Store.YES, Index.TOKENIZED));
8884

89-
try {
90-
this.indexOperation(1, lang, doc, (String)null);
91-
} catch (Exception var15) {
92-
Logger.print(var15.toString());
93-
}
94-
}
85+
try {
86+
this.indexOperation(1, lang, doc, (String)null);
87+
} catch (Exception var15) {
88+
logger.error(var15.getMessage(), var15);
89+
}
9590

9691
}
9792

9893
protected void deleteContent(String uri) {
9994
try {
10095
this.indexOperation(2, (String)null, (Document)null, uri.toLowerCase());
10196
} catch (Exception var3) {
102-
Logger.print(var3.toString());
97+
logger.error(var3.getMessage(), var3);
10398
}
10499

105100
}
@@ -113,7 +108,7 @@ protected synchronized void indexOperation(int op, String lang, Document doc, St
113108
writer.optimize();
114109
writer.close();
115110
} catch (Exception var9) {
116-
Logger.print(var9.toString());
111+
logger.error(var9.getMessage(), var9);
117112
}
118113
break;
119114
case 2:
@@ -135,7 +130,7 @@ protected synchronized void indexOperation(int op, String lang, Document doc, St
135130

136131
reader.close();
137132
} catch (Exception var8) {
138-
Logger.print(var8.toString());
133+
logger.error(var8.getMessage(), var8);
139134
}
140135
}
141136

@@ -157,19 +152,10 @@ private boolean indexExists(String dir) {
157152
private boolean documentExists(String uri, String lang) {
158153
boolean value = false;
159154

160-
try {
161-
IndexSearcher searcher = new IndexSearcher(this.indexDirectory);
162-
BooleanQuery query = new BooleanQuery();
163-
query.add(new TermQuery(new Term("uri", uri)), Occur.MUST);
164-
query.add(new TermQuery(new Term("language", lang)), Occur.MUST);
165-
Hits hits = searcher.search(query);
166-
searcher.close();
167-
if (hits.length() > 0) {
168-
value = true;
169-
}
170-
} catch (IOException var7) {
171-
Logger.print(var7.toString());
172-
}
155+
Hits hits = getHits(uri, lang);
156+
if (hits.length() > 0) {
157+
value = true;
158+
}
173159

174160
return value;
175161
}
@@ -178,18 +164,12 @@ private int getDocumentId(String uri, String lang) {
178164
int value = -1;
179165

180166
try {
181-
IndexSearcher searcher = new IndexSearcher(this.indexDirectory);
182-
BooleanQuery query = new BooleanQuery();
183-
query.add(new TermQuery(new Term("uri", uri)), Occur.MUST);
184-
query.add(new TermQuery(new Term("language", lang)), Occur.MUST);
185-
Hits hits = searcher.search(query);
167+
Hits hits = this.getHits(uri, lang);
186168
if (hits.length() > 0) {
187169
value = hits.id(0);
188170
}
189-
190-
searcher.close();
191171
} catch (IOException var7) {
192-
Logger.print(var7.toString());
172+
logger.error(var7.getMessage(), var7);
193173
}
194174

195175
return value;
@@ -199,6 +179,23 @@ private boolean isMicrosoftExtension(String filePath) {
199179
return filePath.endsWith(".doc") || filePath.endsWith(".docx") || filePath.endsWith(".xls") || filePath.endsWith(".xlsx") || filePath.endsWith(".ppt") || filePath.endsWith(".pptx");
200180
}
201181

182+
private Hits getHits(String uri, String lang) {
183+
IndexSearcher searcher = null;
184+
Hits hits = null;
185+
try {
186+
searcher = new IndexSearcher(this.indexDirectory);
187+
BooleanQuery query = new BooleanQuery();
188+
query.add(new TermQuery(new Term("uri", uri)), Occur.MUST);
189+
query.add(new TermQuery(new Term("language", lang)), Occur.MUST);
190+
hits = searcher.search(query);
191+
searcher.close();
192+
} catch (IOException e) {
193+
logger.error(e.getMessage(), e);
194+
}
195+
196+
return hits;
197+
}
198+
202199
private boolean isPdfExtension(String filePath) {
203200
return filePath.endsWith(".pdf");
204201
}

‎gxflowfulltextsearch/src/main/java/com/genexus/CA/search/Logger.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎gxflowfulltextsearch/src/main/java/com/genexus/CA/search/Searcher.java‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.genexus.CA.search;
22

3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
35
import org.apache.lucene.document.Document;
46
import org.apache.lucene.index.Term;
57
import org.apache.lucene.queryParser.MultiFieldQueryParser;
@@ -11,39 +13,41 @@
1113
import org.apache.lucene.search.BooleanClause.Occur;
1214

1315
public class Searcher {
14-
public static String search(String dir, String lang, String query, int maxResults, int from) {
15-
StringBuffer buff = new StringBuffer();
16+
private static final Logger logger = LogManager.getLogger("Searcher.class");
1617

17-
try {
18-
IndexSearcher searcher = new IndexSearcher(dir);
19-
String[] fields = new String[]{"title", "content"};
20-
Occur[] clauses = new Occur[]{Occur.SHOULD, Occur.SHOULD};
21-
Query q = MultiFieldQueryParser.parse(query, fields, clauses, AnalyzerManager.getAnalyzer(lang));
22-
if (!lang.equals("IND")) {
23-
Query q2 = new TermQuery(new Term("language", lang));
24-
BooleanQuery bq = new BooleanQuery();
25-
bq.add((Query)q, Occur.MUST);
26-
bq.add(q2, Occur.MUST);
27-
q = bq;
28-
}
18+
public static String search(String dir, String lang, String query, int maxResults, int from) {
19+
StringBuilder buff = new StringBuilder();
2920

30-
Hits hits = searcher.search((Query)q);
31-
String time = "";
32-
int max = hits.length();
33-
buff.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
34-
buff.append("<Results hits = '" + max + "' time = '" + time + "'>");
21+
try {
22+
IndexSearcher searcher = new IndexSearcher(dir);
23+
String[] fields = new String[]{"title", "content"};
24+
Occur[] clauses = new Occur[]{Occur.SHOULD, Occur.SHOULD};
25+
Query q = MultiFieldQueryParser.parse(query, fields, clauses, AnalyzerManager.getAnalyzer(lang));
26+
if (!lang.equals("IND")) {
27+
Query q2 = new TermQuery(new Term("language", lang));
28+
BooleanQuery bq = new BooleanQuery();
29+
bq.add((Query) q, Occur.MUST);
30+
bq.add(q2, Occur.MUST);
31+
q = bq;
32+
}
3533

36-
for(int i = 0; i < max; ++i) {
37-
buff.append("<Result>");
38-
Document doc = hits.doc(i);
39-
buff.append("<URI>" + doc.getField("uri").stringValue() + "</URI>");
40-
buff.append("</Result>");
41-
}
42-
} catch (Exception var15) {
43-
Logger.print(var15.toString());
44-
}
34+
Hits hits = searcher.search((Query) q);
35+
String time = "";
36+
int max = hits.length();
37+
buff.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
38+
buff.append("<Results hits = '").append(max).append("' time = '").append(time).append("'>");
4539

46-
buff.append("</Results>");
47-
return buff.toString();
48-
}
40+
for (int i = 0; i < max; ++i) {
41+
buff.append("<Result>");
42+
Document doc = hits.doc(i);
43+
buff.append("<URI>").append(doc.getField("uri").stringValue()).append("</URI>");
44+
buff.append("</Result>");
45+
}
46+
} catch (Exception var15) {
47+
logger.error(var15.getMessage(), var15);
48+
}
49+
50+
buff.append("</Results>");
51+
return buff.toString();
52+
}
4953
}

0 commit comments

Comments
 (0)