You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2011/03/29 21:40:37 UTC
svn commit: r1086699 - in /lucene/dev/trunk/solr/src/java/org/apache/solr:
response/transform/ search/
Author: ryan
Date: Tue Mar 29 19:40:37 2011
New Revision: 1086699
URL: http://svn.apache.org/viewvc?rev=1086699&view=rev
Log:
SOLR-1566 -- passing SolrQueryRequest to DocTransformer
Modified:
lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/search/ReturnFields.java
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java?rev=1086699&r1=1086698&r2=1086699&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java Tue Mar 29 19:40:37 2011
@@ -19,6 +19,7 @@ package org.apache.solr.response.transfo
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.request.SolrQueryRequest;
/**
* @version $Id$
@@ -27,7 +28,7 @@ import org.apache.solr.common.SolrExcept
public class DocIdAugmenterFactory extends TransformerFactory
{
@Override
- public DocTransformer create(String field, String arg) {
+ public DocTransformer create(String field, String arg, SolrQueryRequest req) {
if( arg != null ) {
throw new SolrException( ErrorCode.BAD_REQUEST,
"DocIdAugmenter does not take any arguments" );
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java?rev=1086699&r1=1086698&r2=1086699&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java Tue Mar 29 19:40:37 2011
@@ -23,6 +23,7 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.SolrPluginUtils;
/**
@@ -62,7 +63,7 @@ public class ExplainAugmenterFactory ext
}
@Override
- public DocTransformer create(String field, String arg) {
+ public DocTransformer create(String field, String arg, SolrQueryRequest req) {
Style style = (arg==null)?defaultStyle:getStyle(arg);
return new ExplainAugmenter( field, style );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java?rev=1086699&r1=1086698&r2=1086699&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java Tue Mar 29 19:40:37 2011
@@ -16,6 +16,8 @@
*/
package org.apache.solr.response.transform;
+import org.apache.solr.request.SolrQueryRequest;
+
/**
* @version $Id$
@@ -24,7 +26,7 @@ package org.apache.solr.response.transfo
public class ShardAugmenterFactory extends TransformerFactory
{
@Override
- public DocTransformer create(String field, String arg) {
+ public DocTransformer create(String field, String arg, SolrQueryRequest req) {
String id = "TODO... find ID";
// Maybe it is stored in the context?
// is it a request variable?
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java?rev=1086699&r1=1086698&r2=1086699&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java Tue Mar 29 19:40:37 2011
@@ -20,7 +20,9 @@ package org.apache.solr.response.transfo
import java.util.HashMap;
import java.util.Map;
+import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
/**
@@ -36,7 +38,7 @@ public abstract class TransformerFactory
defaultUserArgs = (String)args.get( "args" );
}
- public abstract DocTransformer create(String field, String args);
+ public abstract DocTransformer create(String field, String args, SolrQueryRequest req);
public static final Map<String,TransformerFactory> defaultFactories = new HashMap<String,TransformerFactory>();
static {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java?rev=1086699&r1=1086698&r2=1086699&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java Tue Mar 29 19:40:37 2011
@@ -21,6 +21,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.util.DateUtil;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.request.SolrQueryRequest;
/**
* @version $Id$
@@ -60,7 +61,7 @@ public class ValueAugmenterFactory exten
}
@Override
- public DocTransformer create(String field, String arg) {
+ public DocTransformer create(String field, String arg, SolrQueryRequest req) {
Object val = value;
if( val == null ) {
val = (arg==null)?defaultValue:getObjectFrom(arg);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/ReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/ReturnFields.java?rev=1086699&r1=1086698&r2=1086699&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/ReturnFields.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/ReturnFields.java Tue Mar 29 19:40:37 2011
@@ -27,7 +27,6 @@ import org.apache.lucene.queryParser.Par
import org.apache.lucene.search.Query;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
@@ -315,7 +314,7 @@ public class ReturnFields
TransformerFactory factory = req.getCore().getTransformerFactory( name );
if( factory != null ) {
- augmenters.addTransformer( factory.create(disp, args) );
+ augmenters.addTransformer( factory.create(disp, args, req) );
}
else {
// unknown field?