You are viewing a plain text version of this content. The canonical link for it is here.

Posted to solr-commits@lucene.apache.org by no...@apache.org on 2009/08/28 07:22:08 UTC

svn commit: r808759 - /lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java

Author: noble
Date: Fri Aug 28 05:22:08 2009
New Revision: 808759

URL: http://svn.apache.org/viewvc?rev=808759&view=rev
Log:
SOLR-1391 The XPath field in the XPathEntityResolver should use the resolver to replace possible tokens

Modified:
    lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java

Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java?rev=808759&r1=808758&r2=808759&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java Fri Aug 28 05:22:08 2009
@@ -126,8 +126,10 @@
           if ("true".equals(field.get("flatten"))) {
             flags = XPathRecordReader.FLATTEN;
           }
+          String xpath = field.get(XPATH);
+          xpath = resolver.replaceTokens(xpath);
           xpathReader.addField(field.get(DataImporter.COLUMN),
-                  field.get(XPATH),
+                  xpath,
                   Boolean.parseBoolean(field.get(DataImporter.MULTI_VALUED)),
                   flags);
         }