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/26 05:52:39 UTC
svn commit: r1085644 - in /lucene/dev/trunk/solr/src/java/org/apache/solr:
response/transform/ValueSourceAugmenter.java search/ReturnFields.java
Author: ryan
Date: Sat Mar 26 04:52:39 2011
New Revision: 1085644
URL: http://svn.apache.org/viewvc?rev=1085644&view=rev
Log:
SOLR-1298 -- parsing ValueSource as DocTransformer
Modified:
lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.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/ValueSourceAugmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java?rev=1085644&r1=1085643&r2=1085644&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java Sat Mar 26 04:52:39 2011
@@ -44,7 +44,7 @@ public class ValueSourceAugmenter extend
@Override
public String getName()
{
- return name;
+ return "function("+name+")";
}
@Override
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=1085644&r1=1085643&r2=1085644&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 Sat Mar 26 04:52:39 2011
@@ -260,16 +260,10 @@ public class ReturnFields
}
if (key==null) {
- SolrParams localParams = parser.getLocalParams();
- if (localParams != null) {
- key = localParams.get("key");
- }
- if (key == null) {
- // use the function name itself as the field name
- key = sp.val.substring(start, sp.pos);
- }
+ key = funcStr;
}
-
+ okFieldNames.add( key );
+ okFieldNames.add( funcStr );
augmenters.addTransformer( new ValueSourceAugmenter( key, parser, vs ) );
}
catch (ParseException e) {