[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/index/writer FileIndexingServiceWriter.java, 1.54, 1.55,

[John W. <jwe...@us...>]

Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/index/writer
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11121/src/org/dlese/dpc/index/writer

Modified Files:
	FileIndexingServiceWriter.java 
Log Message:
NDRIndexer: Fixed problem with deleting records from previous sessions that no longer exist. Note
that some records that should be deleted may still remain in an existing index. Delete and 
rebuild the entire index one time to ensure proper deletions going forward.

Index: FileIndexingServiceWriter.java
===================================================================
RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/index/writer/FileIndexingServiceWriter.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** FileIndexingServiceWriter.java	20 Jul 2010 05:08:29 -0000	1.54
--- FileIndexingServiceWriter.java	14 Jan 2011 00:31:58 -0000	1.55
***************
*** 71,74 ****
--- 71,75 ----
  public abstract class FileIndexingServiceWriter implements DocWriter {
  	private static boolean debug = false;
+ 	
  	private boolean validateFiles = false;
  	private boolean abortIndexing = false;
***************
*** 577,585 ****
  
  			// If a FileIndexingPlugin has been passed in, use it...
! 			if (plugin != null)
  				plugin.addFields(sourceFile, doc, existingLuceneDoc, getDocType(), getDocGroup());
  			// Else if we have a pre-configured FileIndexingPlugin, use it...
! 			else if (fileIndexingPlugin != null)
  				fileIndexingPlugin.addFields(sourceFile, doc, existingLuceneDoc, getDocType(), getDocGroup());
  
  			// Record the time this file was indexed:
--- 578,593 ----
  
  			// If a FileIndexingPlugin has been passed in, use it...
! 			if (plugin != null) {
! 				//prtln("Using passed-in plugin: " + plugin.getClass().getName());
  				plugin.addFields(sourceFile, doc, existingLuceneDoc, getDocType(), getDocGroup());
+ 			}
  			// Else if we have a pre-configured FileIndexingPlugin, use it...
! 			else if (fileIndexingPlugin != null) {
! 				//prtln("Using existing plugin: " + fileIndexingPlugin.getClass().getName());
  				fileIndexingPlugin.addFields(sourceFile, doc, existingLuceneDoc, getDocType(), getDocGroup());
+ 			}
+ 			else {
+ 				//prtln("plugins are null!");
+ 			}
  
  			// Record the time this file was indexed: