did you mean ...?

danielvarga · Jan 30, 2012 · 1695ca5 · 1695ca5
1 parent d66c522
commit 1695ca5
Show file tree

Hide file tree

Showing 4 changed files with 277 additions and 193 deletions.
diff --git a/src/main/java/hu/mokk/hunglish/job/MockJob.java b/src/main/java/hu/mokk/hunglish/job/MockJob.java
@@ -66,8 +66,11 @@ public void doSomeAction() {
 					logger.info("harness job finished, exit code:" + exitCode);
 				}
 				if (HARNESS_SUCCESS_CODE == exitCode) {
-					indexer.indexAll();
-					searcher.reInitSearcher();
+					logger.info("harness was successful, indexing comes...");
+					if (indexer.indexAll()){
+						logger.info("indexing changed indexes, sercher will be reinitialized...");
+						searcher.reInitSearcher();
+					}
 				}
 
 			} else {

diff --git a/src/main/java/hu/mokk/hunglish/lucene/Indexer.java b/src/main/java/hu/mokk/hunglish/lucene/Indexer.java
@@ -370,19 +370,21 @@ public void optimizeIndex() {
 	 * Create a jdbcConnection calls indexBatch until it returns false using the
 	 * connection clear up connection
 	 */
-	synchronized public void indexAll() {
+	synchronized public boolean indexAll() {
+		boolean indexchanged = false;
 		Connection jdbcConnection = null;
 		try {
 
 			jdbcConnection = IndexerHelper.getJdbcConnection(dataSource);
 			logger.info("db connection initialized");
 
-			boolean indexchanged = deleteAllFromIndex(jdbcConnection);
+			indexchanged = deleteAllFromIndex(jdbcConnection);
 			indexchanged |= addAllToIndex(jdbcConnection);
 
 			if (indexchanged){
-				optimizeIndex();
-			}
+				logger.info("index will be optimized");
+				optimizeIndex();				
+			}			
 		} catch (SQLException sex) {
 
 			logger.error("Couldn't initialize database connection for indexing.", sex);
@@ -391,6 +393,7 @@ synchronized public void indexAll() {
 			IndexerHelper.closeConnection(jdbcConnection);
 			logger.info("db connection closed");
 		}
+		return indexchanged;
 	}