Author: markus
Date: Thu Apr 14 10:06:06 2011
New Revision: 1092091
URL: http://svn.apache.org/viewvc?rev=1092091&view=rev
Log:
NUTCH-977 SolrMappingReader uses hardcoded configuration parameter name for
mapping file
Modified:
nutch/branches/branch-1.3/CHANGES.txt
nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
Modified: nutch/branches/branch-1.3/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/CHANGES.txt?rev=1092091&r1=1092090&r2=1092091&view=diff
==============================================================================
--- nutch/branches/branch-1.3/CHANGES.txt (original)
+++ nutch/branches/branch-1.3/CHANGES.txt Thu Apr 14 10:06:06 2011
@@ -2,6 +2,8 @@ Nutch Change Log
Release 1.3 - Current Development
+* NUTCH-977 SolrMappingReader uses hardcoded configuration parameter name for
mapping file (markus)
+
* NUTCH-976 Rename properties solrindex.* to solr.* (markus)
* NUTCH-890 Fix IllegalAccessError with slf4j used in Solrj (markus)
Modified:
nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java?rev=1092091&r1=1092090&r2=1092091&view=diff
==============================================================================
---
nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
(original)
+++
nutch/branches/branch-1.3/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
Thu Apr 14 10:06:06 2011
@@ -38,9 +38,6 @@ import org.xml.sax.SAXException;
public class SolrMappingReader {
public static Log LOG = LogFactory.getLog(SolrMappingReader.class);
-
- /** The property name of the parse solr index mapping location */
- private static final String SS_FILE_MAPPING = "solrindex.mapping.file";
private Configuration conf;
@@ -65,7 +62,8 @@ public class SolrMappingReader {
private void parseMapping() {
InputStream ssInputStream = null;
- ssInputStream =
conf.getConfResourceAsInputStream(conf.get(SS_FILE_MAPPING,
"solrindex-mapping.xml"));
+ ssInputStream =
conf.getConfResourceAsInputStream(conf.get(SolrConstants.MAPPING_FILE,
"solrindex-mapping.xml"));
+
InputSource inputSource = new InputSource(ssInputStream);
try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();