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 sh...@apache.org on 2008/10/23 08:16:45 UTC
svn commit: r707287 - in /lucene/solr/trunk/contrib/dataimporthandler:
CHANGES.txt src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
Author: shalin
Date: Wed Oct 22 23:16:45 2008
New Revision: 707287
URL: http://svn.apache.org/viewvc?rev=707287&view=rev
Log:
SOLR-823 -- Request parameter variables ${dataimporter.request.xxx} are not resolved
Modified:
lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=707287&r1=707286&r2=707287&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Wed Oct 22 23:16:45 2008
@@ -34,6 +34,9 @@
1. SOLR-800: Deep copy collections to avoid ConcurrentModificationException in XPathEntityprocessor while streaming
(Kyle Morrison, Noble Paul via shalin)
+2. SOLR-823: Request parameter variables ${dataimporter.request.xxx} are not resolved
+ (Mck SembWever, Noble Paul, shalin)
+
Documentation
----------------------
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=707287&r1=707286&r2=707287&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Wed Oct 22 23:16:45 2008
@@ -85,7 +85,7 @@
indexerNamespace.put(LAST_INDEX_TIME, DataImporter.DATE_TIME_FORMAT
.format(context.getLastIndexTime()));
indexerNamespace.put(INDEX_START_TIME, context.getIndexStartTime());
- indexerNamespace.put("request", requestParameters);
+ indexerNamespace.put("request", requestParameters.requestParams);
indexerNamespace.put("defaults", defaultVariables);
indexerNamespace.put("functions", EvaluatorBag.getFunctionsNamespace(resolver,
dataImporter.getConfig().evaluators));
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=707287&r1=707286&r2=707287&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java Wed Oct 22 23:16:45 2008
@@ -20,6 +20,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.Assert;
+import org.apache.solr.request.LocalSolrQueryRequest;
import java.util.ArrayList;
import java.util.List;
@@ -69,6 +70,21 @@
@Test
@SuppressWarnings("unchecked")
+ public void testRequestParamsAsVariable() throws Exception {
+ List rows = new ArrayList();
+ rows.add(createMap("id", "101", "desc", "ApacheSolr"));
+ MockDataSource.setIterator("select * from books where category='search'", rows.iterator());
+
+ LocalSolrQueryRequest request = lrf.makeRequest("command", "full-import",
+ "debug", "on", "clean", "true", "commit", "true",
+ "category", "search",
+ "dataConfig", requestParamAsVariable);
+ h.query("/dataimport", request);
+ assertQ(req("desc:ApacheSolr"), "//*[@numFound='1']");
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
public void testContext() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -85,7 +101,17 @@
}
public static class MockDataSource2 extends MockDataSource {
-
+
}
+ private final String requestParamAsVariable = "<dataConfig>\n" +
+ " <dataSource type=\"MockDataSource\" />\n" +
+ " <document>\n" +
+ " <entity name=\"books\" query=\"select * from books where category='${dataimporter.request.category}'\">\n" +
+ " <field column=\"id\" />\n" +
+ " <field column=\"desc\" />\n" +
+ " </entity>\n" +
+ " </document>\n" +
+ "</dataConfig>";
+
}