You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2008/12/02 18:51:08 UTC
svn commit: r722541 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
src/test/org/apache/solr/request/JSONWriterTest.java
Author: yonik
Date: Tue Dec 2 09:51:08 2008
New Revision: 722541
URL: http://svn.apache.org/viewvc?rev=722541&view=rev
Log:
SOLR-892:Fix serialization of booleans for PHPSerializedResponseWriter
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
lucene/solr/trunk/src/test/org/apache/solr/request/JSONWriterTest.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=722541&r1=722540&r2=722541&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Tue Dec 2 09:51:08 2008
@@ -146,6 +146,9 @@
13. SOLR-836: Add missing "a" to the example stopwords.txt (yonik)
+14. SOLR-892: Fix serialization of booleans for PHPSerializedResponseWriter
+ (yonik)
+
Other Changes
----------------------
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java?rev=722541&r1=722540&r2=722541&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java Tue Dec 2 09:51:08 2008
@@ -243,6 +243,11 @@
public void writeBool(String name, boolean val) throws IOException {
writer.write(val ? "b:1;" : "b:0;");
}
+
+ @Override
+ public void writeBool(String name, String val) throws IOException {
+ writeBool(name, val.charAt(0) == 't');
+ }
@Override
public void writeInt(String name, String val) throws IOException {
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=722541&r1=722540&r2=722541&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 Tue Dec 2 09:51:08 2008
@@ -50,5 +50,18 @@
assertEquals(buf.toString(), "{'data1'=>(0.0/0.0),'data2'=>-(1.0/0.0),'data3'=>(1.0/0.0)}");
}
+
+ public void testPHPS() throws IOException {
+ SolrQueryRequest req = req("dummy");
+ SolrQueryResponse rsp = new SolrQueryResponse();
+ QueryResponseWriter w = new PHPSerializedResponseWriter();
+
+ StringWriter buf = new StringWriter();
+ rsp.add("data1", "hello");
+ rsp.add("data2", 42);
+ rsp.add("data3", true);
+ w.write(buf, req, rsp);
+ assertEquals(buf.toString(), "a:3:{s:5:\"data1\";s:5:\"hello\";s:5:\"data2\";i:42;s:5:\"data3\";b:1;}");
+ }
}