1
1
package ca .nrc .data .harvesting ;
2
2
3
3
import java .io .IOException ;
4
- import java .util .ArrayList ;
5
- import java .util .HashMap ;
6
4
import java .util .HashSet ;
7
- import java .util .List ;
8
- import java .util .Map ;
9
5
import java .util .Set ;
10
6
11
- import org .apache .log4j .Logger ;
7
+ import org .apache .logging .log4j .LogManager ;
8
+ import org .apache .logging .log4j .Logger ;
12
9
13
10
import ca .nrc .data .harvesting .SearchEngine .Hit ;
14
11
import ca .nrc .data .harvesting .SearchEngine .Query ;
@@ -63,7 +60,7 @@ private void initializeSearchEngineMultiQuery(String _bingKey) throws IOExceptio
63
60
64
61
public SearchResults search (Query query ) throws SearchEngineException , IOException {
65
62
66
- Logger tLogger = Logger .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.search" );
63
+ Logger tLogger = LogManager .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.search" );
67
64
68
65
if (tLogger .isTraceEnabled ()) {
69
66
tLogger .trace ("Invoked with query=" +PrettyPrinter .print (query ));
@@ -90,7 +87,7 @@ public SearchResults search(Query query) throws SearchEngineException, IOExcepti
90
87
*/
91
88
92
89
private void createAndStartWorkers (Query query ) throws SearchEngineException {
93
- Logger tLogger = Logger .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.createAndStartWorkers" );
90
+ Logger tLogger = LogManager .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.createAndStartWorkers" );
94
91
tLogger .trace ("invoked" );
95
92
96
93
// System.out.println("** createAndStartWorkers: shouldCheckHitSummary()="+shouldCheckHitSummary());
@@ -118,7 +115,7 @@ private void createAndStartWorkers(Query query) throws SearchEngineException {
118
115
}
119
116
120
117
private SearchResults mergeTermResults (Integer maxHits ) throws SearchEngineException {
121
- Logger tLogger = Logger .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.mergeTermResults" );
118
+ Logger tLogger = LogManager .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.mergeTermResults" );
122
119
123
120
tLogger .trace ("invoked with maxHits=" +maxHits );
124
121
@@ -142,7 +139,7 @@ private SearchResults mergeTermResults(Integer maxHits) throws SearchEngineExcep
142
139
}
143
140
144
141
private void addHitsFromSingleTermWorkers (Integer maxHits ) throws SearchEngineException {
145
- Logger tLogger = Logger .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.addHitsFromSingleTermWorkers" );
142
+ Logger tLogger = LogManager .getLogger ("ca.nrc.data.harvesting.SearchEngineMultQuery.addHitsFromSingleTermWorkers" );
146
143
147
144
tLogger .trace ("Adding hits for search for each of the workers" );
148
145
0 commit comments