Project

General

Profile

« Previous | Next » 

Revision 9053

add stub merge method to match Skye's recent refactoring to support reindexing when deletes are performed.

View differences:

metacat-index/src/main/java/edu/ucsb/nceas/metacat/index/annotation/RdfXmlSubprocessor.java
30 30
import java.util.Set;
31 31

  
32 32
import javax.xml.parsers.ParserConfigurationException;
33
import javax.xml.xpath.XPathExpressionException;
33 34

  
35
import org.apache.commons.codec.EncoderException;
34 36
import org.apache.commons.logging.Log;
35 37
import org.apache.commons.logging.LogFactory;
36 38
import org.apache.solr.client.solrj.SolrServer;
......
312 314
		return doc;
313 315
	}
314 316

  
317
	@Override
318
	public SolrDoc mergeWithIndexedDocument(SolrDoc indexDocument)
319
			throws IOException, EncoderException, XPathExpressionException {
320
		// TODO: actually perform merging 
321
		return indexDocument;
322
	}
315 323

  
324

  
316 325
}

Also available in: Unified diff