You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/07/01 19:37:17 UTC
svn commit: r1142003 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/ lucene/backwards/src/test-framework/
lucene/backwards/src/test/ solr/ solr/example/solr/conf/
solr/src/java/org/apache/solr/handler/ solr/src/java/org/apache/solr/re...
Author: uschindler
Date: Fri Jul 1 17:37:17 2011
New Revision: 1142003
URL: http://svn.apache.org/viewvc?rev=1142003&view=rev
Log:
SOLR-2630: Added new XsltUpdateRequestHandler that works like XmlUpdateRequestHandler but allows to transform the POSTed XML document using XSLT
Added:
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java
- copied unchanged from r1141999, lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java
- copied, changed from r1141999, lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java
lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/xslt/xsl-update-handler-test.xsl
- copied unchanged from r1141999, lucene/dev/trunk/solr/src/test-files/solr/conf/xslt/xsl-update-handler-test.xsl
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
- copied unchanged from r1141999, lucene/dev/trunk/solr/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XMLLoader.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/XSLTResponseWriter.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1142003&r1=1142002&r2=1142003&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Jul 1 17:37:17 2011
@@ -39,6 +39,11 @@ New Features
checked only for documents that match the main query and all other filters.
The "frange" query now implements the PostFilter interface. (yonik)
+* SOLR-2630: Added new XsltUpdateRequestHandler that works like
+ XmlUpdateRequestHandler but allows to transform the POSTed XML document
+ using XSLT. This allows to POST arbitrary XML documents to the update
+ handler, as long as you also provide a XSL to transform them to a valid
+ Solr input document. (Upayavira, Uwe Schindler)
Optimizations
----------------------
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml?rev=1142003&r1=1142002&r2=1142003&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml Fri Jul 1 17:37:17 2011
@@ -896,6 +896,13 @@
</lst>
</requestHandler>
+ <!-- XSLT Update Request Handler
+ Transforms incoming XML with stylesheet identified by tr=
+ -->
+ <requestHandler name="/update/xslt"
+ startup="lazy"
+ class="solr.XsltUpdateRequestHandler"/>
+
<!-- Field Analysis Request Handler
RequestHandler that provides much the same functionality as
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XMLLoader.java?rev=1142003&r1=1142002&r2=1142003&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XMLLoader.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XMLLoader.java Fri Jul 1 17:37:17 2011
@@ -48,7 +48,7 @@ import java.io.IOException;
**/
class XMLLoader extends ContentStreamLoader {
protected UpdateRequestProcessor processor;
- private XMLInputFactory inputFactory;
+ protected XMLInputFactory inputFactory;
public XMLLoader(UpdateRequestProcessor processor, XMLInputFactory inputFactory) {
this.processor = processor;
Copied: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java (from r1141999, lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java?p2=lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java&r1=1141999&r2=1142003&rev=1142003&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java Fri Jul 1 17:37:17 2011
@@ -84,7 +84,7 @@ class XsltXMLLoader extends XMLLoader {
// second step feed the intermediate DOM tree into StAX parser:
try {
parser = inputFactory.createXMLStreamReader(new DOMSource(result.getNode()));
- this.processUpdate(req, processor, parser);
+ this.processUpdate(processor, parser);
} catch (XMLStreamException e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e.getMessage(), e);
} finally {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/XSLTResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/XSLTResponseWriter.java?rev=1142003&r1=1142002&r2=1142003&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/XSLTResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/XSLTResponseWriter.java Fri Jul 1 17:37:17 2011
@@ -35,6 +35,7 @@ import javax.xml.transform.stream.Stream
import org.apache.solr.core.SolrConfig;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.XMLErrorLogger;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.xslt.TransformerProvider;
@@ -53,6 +54,7 @@ public class XSLTResponseWriter implemen
private static final String XSLT_CACHE_PARAM = "xsltCacheLifetimeSeconds";
private static final Logger log = LoggerFactory.getLogger(XSLTResponseWriter.class);
+ private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
public void init(NamedList n) {
final SolrParams p = SolrParams.toSolrParams(n);
@@ -126,6 +128,7 @@ public class XSLTResponseWriter implemen
Transformer result = (Transformer)ctx.get(CONTEXT_TRANSFORMER_KEY);
if(result==null) {
result = TransformerProvider.instance.getTransformer(solrConfig, xslt,xsltCacheLifetimeSeconds.intValue());
+ result.setErrorListener(xmllog);
ctx.put(CONTEXT_TRANSFORMER_KEY,result);
}
return result;