Update of /var/cvs/contributions/lucene/src/org/mmbase/module/lucene
In directory james.mmbase.org:/tmp/cvs-serv23321
Modified Files:
Indexer.java Searcher.java
Log Message:
lowered some log, clarified some errors
See also:
http://cvs.mmbase.org/viewcvs/contributions/lucene/src/org/mmbase/module/lucene
Index: Indexer.java
===================================================================
RCS file:
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Indexer.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Indexer.java 8 Feb 2008 13:23:25 -0000 1.55
+++ Indexer.java 25 Feb 2008 10:46:35 -0000 1.56
@@ -34,7 +34,7 @@
*
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Indexer.java,v 1.55 2008/02/08 13:23:25 michiel Exp $
+ * @version $Id: Indexer.java,v 1.56 2008/02/25 10:46:35 michiel Exp $
**/
public class Indexer {
@@ -188,6 +188,8 @@
Properties lastIndexed = new Properties();
try {
lastIndexed.load(new FileInputStream(lucenePath +
java.io.File.separator + "lastIndexed.properties"));
+ } catch (FileNotFoundException fnfe) {
+ log.debug(fnfe);
} catch (IOException ioe) {
log.service(ioe);
}
@@ -409,8 +411,9 @@
long errorCountBefore = errorCount;
EventManager.getInstance().propagateEvent(new
FullIndexEvents.Event(getName(), FullIndexEvents.Status.START, 0));
IndexWriter writer = null;
+ Directory fullIndex = null;
try {
- Directory fullIndex = getDirectoryForFullIndex();
+ fullIndex = getDirectoryForFullIndex();
writer = new IndexWriter(fullIndex, analyzer, true);
long startTime = System.currentTimeMillis();
// process all queries
@@ -434,15 +437,16 @@
Directory.copy(fullIndex, getDirectory(), true);
Date lastFullIndex = setLastFullIndex(startTime);
log.info("Full index finished at " + lastFullIndex + ". Copied
" + fullIndex + " to " + getDirectory() + " Total nr documents in index '" +
getName() + "': " + writer.docCount());
- EventManager.getInstance().propagateEvent(new
FullIndexEvents.Event(getName(), FullIndexEvents.Status.IDLE,
writer.docCount()));
} else {
addError((errorCount - errorCountBefore) + " errors during
full index. Will not update the index.");
}
+ EventManager.getInstance().propagateEvent(new
FullIndexEvents.Event(getName(), FullIndexEvents.Status.IDLE,
writer.docCount()));
} catch (Exception e) {
- addError(e.getMessage());
+ addError("" + fullIndex + ": " + e.getMessage());
log.error("Cannot run FullIndex: " + e.getMessage(), e);
} finally {
if (writer != null) { try { writer.close(); } catch (IOException
ioe) { log.error("Can't close index writer: " + ioe.getMessage()); } }
+
}
EventManager.getInstance().propagateEvent(new
NewSearcher.Event(getName()));
}
Index: Searcher.java
===================================================================
RCS file:
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Searcher.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Searcher.java 8 Feb 2008 13:27:44 -0000 1.46
+++ Searcher.java 25 Feb 2008 10:46:35 -0000 1.47
@@ -9,7 +9,7 @@
*/
package org.mmbase.module.lucene;
-import java.io.IOException;
+import java.io.*;
import java.util.*;
import org.apache.lucene.queryParser.ParseException;
@@ -33,7 +33,7 @@
* A wrapper around Lucene's [EMAIL PROTECTED]
org.apache.lucene.search.IndexSearcher}. Every [EMAIL PROTECTED] Indexer} has
its own Searcher.
*
* @author Pierre van Rooden
- * @version $Id: Searcher.java,v 1.46 2008/02/08 13:27:44 michiel Exp $
+ * @version $Id: Searcher.java,v 1.47 2008/02/25 10:46:35 michiel Exp $
* @todo Should the StopAnalyzers be replaced by index.analyzer? Something
else?
**/
public class Searcher implements NewSearcher.Listener,
FullIndexEvents.Listener {
@@ -270,6 +270,9 @@
try {
reader = IndexReader.open(copy ?
index.getDirectoryForFullIndex() : index.getDirectory());
return reader.numDocs();
+ } catch ( FileNotFoundException nfe) {
+ log.debug(nfe + " returning -1");
+ return -1;
} catch (IOException ioe) {
log.service(ioe + " returning -1");
return -1;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
