svn commit: r649185 - in /lucene/solr/trunk: CHANGES.txt src/java/org/apache/solr/request/SolrQueryResponse.java src/test/org/apache/solr/request/JSONWriterTest.java src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java

[gsingers]

Author: gsingers
Date: Thu Apr 17 09:57:55 2008
New Revision: 649185

URL: http://svn.apache.org/viewvc?rev=649185&view=rev
Log:
SOLR-267: Reopen.  Remove adding info to the HTTP Header.  Remove double 
responseHeader in the namedList response

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java
    lucene/solr/trunk/src/test/org/apache/solr/request/JSONWriterTest.java
    
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=649185&r1=649184&r2=649185&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Thu Apr 17 09:57:55 2008
@@ -357,6 +357,7 @@
 
 27. SOLR-267: Changed logging to report number of hits, and also provide a 
mechanism to add log messages to be output by the SolrCore via a NamedList toLog
     member variable.  (Will Johnson, yseeley, gsingers)
+   SOLR-267: Removed adding values to the HTTP headers in SolrDispatchFilter 
(gsingers)
 
 28. SOLR-509: Moved firstSearcher event notification to the end of the 
SolrCore constructor (Koji Sekiguchi via gsingers)
 

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java?rev=649185&r1=649184&r2=649185&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java 
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java 
Thu Apr 17 09:57:55 2008
@@ -79,7 +79,6 @@
   ***/
 
   public SolrQueryResponse() {
-         add("responseHeader", new SimpleOrderedMap<Object>());
   }
   
   

Modified: lucene/solr/trunk/src/test/org/apache/solr/request/JSONWriterTest.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/request/JSONWriterTest.java?rev=649185&r1=649184&r2=649185&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/request/JSONWriterTest.java 
(original)
+++ lucene/solr/trunk/src/test/org/apache/solr/request/JSONWriterTest.java Thu 
Apr 17 09:57:55 2008
@@ -42,12 +42,12 @@
     rsp.add("data2", Double.NEGATIVE_INFINITY);
     rsp.add("data3", Float.POSITIVE_INFINITY);
     w.write(buf, req, rsp);
-    assertEquals(buf.toString(), 
"{'responseHeader':{},'data1':float('NaN'),'data2':-float('Inf'),'data3':float('Inf')}");
+    assertEquals(buf.toString(), 
"{'data1':float('NaN'),'data2':-float('Inf'),'data3':float('Inf')}");
 
     w = new RubyResponseWriter();
     buf = new StringWriter();
     w.write(buf, req, rsp);
-    assertEquals(buf.toString(), 
"{'responseHeader'=>{},'data1'=>(0.0/0.0),'data2'=>-(1.0/0.0),'data3'=>(1.0/0.0)}");
+    assertEquals(buf.toString(), 
"{'data1'=>(0.0/0.0),'data2'=>-(1.0/0.0),'data3'=>(1.0/0.0)}");
 
   }
   

Modified: 
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java?rev=649185&r1=649184&r2=649185&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
 (original)
+++ 
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
 Thu Apr 17 09:57:55 2008
@@ -273,14 +273,15 @@
                  */
                 this.execute( req, handler, solrReq, solrRsp );
               // add info to http headers
-                try {
+              //TODO: See SOLR-232 and SOLR-267.  
+                /*try {
                   NamedList solrRspHeader = solrRsp.getResponseHeader();
                  for (int i=0; i<solrRspHeader.size(); i++) {
                    ((javax.servlet.http.HttpServletResponse) 
response).addHeader(("Solr-" + solrRspHeader.getName(i)), 
String.valueOf(solrRspHeader.getVal(i)));
                  }
                 } catch (ClassCastException cce) {
                   log.log(Level.WARNING, "exception adding response header log 
information", cce);
-                }
+                }*/
                 if( solrRsp.getException() != null ) {
                   sendError( (HttpServletResponse)response, 
solrRsp.getException() );
                 }