From 9e0916333e0cc3f4ded2db32c1725392d7522c74 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryan@apache.org>
Date: Fri, 14 Oct 2011 00:34:51 +0000
Subject: [PATCH] SOLR-2831: resolve IndexableField in
 BinaryResponseWriter.java

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1183178 13f79535-47bb-0310-9956-ffa450edef68
---
 .../solr/response/BinaryResponseWriter.java   | 77 +++++++++++--------
 .../solr/response/TextResponseWriter.java     |  3 +
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
index 870c0997a85..f7062726692 100755
--- a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
@@ -87,7 +87,18 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
         writeResults(ctx, codec);
         return null; // null means we completely handled it
       }
-
+      if( o instanceof IndexableField ) {
+        if(schema == null) schema = solrQueryRequest.getSchema(); 
+        
+        IndexableField f = (IndexableField)o;
+        SchemaField sf = schema.getFieldOrNull(f.name());
+        try {
+          o = getValue(sf, f);
+        } 
+        catch (Exception e) {
+          LOG.warn("Error reading a field : " + o, e);
+        }
+      }
       if (o instanceof SolrDocument) {
         // Remove any fields that were not requested.
         // This typically happens when distributed search adds 
@@ -163,36 +174,19 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
         String fieldName = f.name();
         if( !returnFields.wantsField(fieldName) ) 
           continue;
+        
         SchemaField sf = schema.getFieldOrNull(fieldName);
-        FieldType ft = null;
-        if(sf != null) ft =sf.getType();
-        Object val;
-        if (ft == null) {  // handle fields not in the schema
-          BytesRef bytesRef = f.binaryValue();
-          if (bytesRef != null) {
-            if (bytesRef.offset == 0 && bytesRef.length == bytesRef.bytes.length) {
-              val = bytesRef.bytes;
-            } else {
-              final byte[] bytes = new byte[bytesRef.length];
-              val = bytes;
-              System.arraycopy(bytesRef.bytes, bytesRef.offset, bytes, 0, bytesRef.length);
-            }
-          } else val = f.stringValue();
-        } else {
-          try {
-            if (useFieldObjects && KNOWN_TYPES.contains(ft.getClass())) {
-              val = ft.toObject(f);
-            } else {
-              val = ft.toExternal(f);
-            }
-          } catch (Exception e) {
-            // There is a chance of the underlying field not really matching the
-            // actual field type . So ,it can throw exception
-            LOG.warn("Error reading a field from document : " + solrDoc, e);
-            //if it happens log it and continue
-            continue;
-          }
+        Object val = null;
+        try {
+          val = getValue(sf,f);
+        } catch (Exception e) {
+          // There is a chance of the underlying field not really matching the
+          // actual field type . So ,it can throw exception
+          LOG.warn("Error reading a field from document : " + solrDoc, e);
+          //if it happens log it and continue
+          continue;
         }
+          
         if(sf != null && sf.multiValued() && !solrDoc.containsKey(fieldName)){
           ArrayList l = new ArrayList();
           l.add(val);
@@ -203,7 +197,30 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
       }
       return solrDoc;
     }
-
+    
+    public Object getValue(SchemaField sf, IndexableField f) throws Exception {
+      FieldType ft = null;
+      if(sf != null) ft =sf.getType();
+      
+      if (ft == null) {  // handle fields not in the schema
+        BytesRef bytesRef = f.binaryValue();
+        if (bytesRef != null) {
+          if (bytesRef.offset == 0 && bytesRef.length == bytesRef.bytes.length) {
+            return bytesRef.bytes;
+          } else {
+            final byte[] bytes = new byte[bytesRef.length];
+            System.arraycopy(bytesRef.bytes, bytesRef.offset, bytes, 0, bytesRef.length);
+            return bytes;
+          }
+        } else return f.stringValue();
+      } else {
+        if (useFieldObjects && KNOWN_TYPES.contains(ft.getClass())) {
+          return ft.toObject(f);
+        } else {
+          return ft.toExternal(f);
+        }
+      }
+    }
   }
 
 
diff --git a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
index 7ebaa8b7f49..3c7d2939c03 100644
--- a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
@@ -146,6 +146,9 @@ public abstract class TextResponseWriter {
       writeDouble(name, ((Double)val).doubleValue());
     } else if (val instanceof Document) {
       SolrDocument doc = toSolrDocument( (Document)val );
+      if( returnFields.getTransformer() != null ) {
+        returnFields.getTransformer().transform( doc, -1 );
+      }
       writeSolrDocument(name, doc, returnFields, 0 );
     } else if (val instanceof SolrDocument) {
       writeSolrDocument(name, (SolrDocument)val, returnFields, 0);