put linefeed to the xml output.

groonga · Nov 30, 2009 · 2dfa561 · 2dfa561
1 parent 159f77c
commit 2dfa561
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 30 deletions.
diff --git a/doc/issues/html/issue-40ba77e1ab1d76f669ec8e158e04e97d6184d8e9.html b/doc/issues/html/issue-40ba77e1ab1d76f669ec8e158e04e97d6184d8e9.html
@@ -63,8 +63,8 @@ <h2>Details</h2>
     <tr>
       <td class="attrname">Status:</td>
       <td class="attrval">
-        unstarted
-
+        closed: fixed
+        <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
       </td>
     </tr>
 
@@ -80,6 +80,14 @@ <h2>Issue log</h2>
   <tbody>
 
     <tr class="even-row">
+      <td class="date">2009-11-30 04:43 GMT</td>
+      <td class="person">Ryo Onodera &lt;onodera@...&gt;</td>
+      <td class="message">closed with disposition fixed</td>
+    </tr>
+
+    <tr><td></td></tr>
+
+    <tr class="odd-row">
       <td class="date">2009-11-24 13:44 GMT</td>
       <td class="person">daijiro &lt;daijiro.mori@...&gt;</td>
       <td class="message">created</td>

diff --git a/doc/issues/html/release-1.0.0.html b/doc/issues/html/release-1.0.0.html
@@ -26,12 +26,12 @@ <h1>groonga release 1.0.0</h1>
       <td class="attrname">Completion:</td>
       <td>
 
-      <span class='progress-meter'><span class='progress-meter-done'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class='progress-meter-undone'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></span>
-      10%
+      <span class='progress-meter'><span class='progress-meter-done'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class='progress-meter-undone'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></span>
+      13%
       </td>
     </tr>
     <tr><td></td><td class="attrval">
-      3 / 30 issues
+      4 / 30 issues
     </td></tr>
   </tbody>
 </table>
@@ -162,7 +162,7 @@ <h2>Issues</h2>
     </tr>
 
     <tr>
-      <td>  </td>
+      <td> <img title="fixed" src="green-check.png" alt="fixed"/> </td>
       <td class="littledate">2009-11-24</td>
       <td class="issuename">
         <a href="issue-40ba77e1ab1d76f669ec8e158e04e97d6184d8e9.html">put linefeed to the xml output</a>
@@ -352,18 +352,18 @@ <h2>Recent activity for this release</h2>
   <tbody>
 
     <tr class="even-row">
-      <td class="date">2009-11-27</td>
+      <td class="date">2009-11-30</td>
       <td class="issuename">
-        <a href="issue-9ed7ab3fc422ef7222cc69e34faa409e7e74c6b9.html">grn_expr_parse numeric value handling</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
+        <a href="issue-40ba77e1ab1d76f669ec8e158e04e97d6184d8e9.html">put linefeed to the xml output</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
       </td>
       <td> closed with disposition fixed </td>
     </tr>
     <tr><td></td></tr>
 
     <tr class="odd-row">
-      <td class="date">2009-11-26</td>
+      <td class="date">2009-11-27</td>
       <td class="issuename">
-        <a href="issue-984c333ac497a39f79ef9349ba086c9a4ac88f24.html">output columns '_key*' are interpreted as '_key'</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
+        <a href="issue-9ed7ab3fc422ef7222cc69e34faa409e7e74c6b9.html">grn_expr_parse numeric value handling</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
       </td>
       <td> closed with disposition fixed </td>
     </tr>
@@ -372,34 +372,34 @@ <h2>Recent activity for this release</h2>
     <tr class="even-row">
       <td class="date">2009-11-26</td>
       <td class="issuename">
-        <a href="issue-5bbdf2428fdeeaaec9229211204ea89775eef83b.html">possible crash on simultaneous read/write to ii</a> 
+        <a href="issue-984c333ac497a39f79ef9349ba086c9a4ac88f24.html">output columns '_key*' are interpreted as '_key'</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
       </td>
-      <td> created </td>
+      <td> closed with disposition fixed </td>
     </tr>
     <tr><td></td></tr>
 
     <tr class="odd-row">
-      <td class="date">2009-11-25</td>
+      <td class="date">2009-11-26</td>
       <td class="issuename">
-        <a href="issue-bccd6f0d7dca854657e5d40de27dea9a506bcd1b.html">parse0, parse4... bit field</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
+        <a href="issue-5bbdf2428fdeeaaec9229211204ea89775eef83b.html">possible crash on simultaneous read/write to ii</a> 
       </td>
-      <td> closed with disposition fixed </td>
+      <td> created </td>
     </tr>
     <tr><td></td></tr>
 
     <tr class="even-row">
       <td class="date">2009-11-25</td>
       <td class="issuename">
-        <a href="issue-690c05001ca0607d16d910a9be30aeb3799a402b.html">bogus result of "select" with negative "offset" and no "sortby"</a> 
+        <a href="issue-bccd6f0d7dca854657e5d40de27dea9a506bcd1b.html">parse0, parse4... bit field</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
       </td>
-      <td> created </td>
+      <td> closed with disposition fixed </td>
     </tr>
     <tr><td></td></tr>
 
     <tr class="odd-row">
       <td class="date">2009-11-25</td>
       <td class="issuename">
-        <a href="issue-df04c90c558d74906fd043ff0a58bd2d5fcda92c.html">"drilldown_output_columns" of "select" and "*"</a> 
+        <a href="issue-690c05001ca0607d16d910a9be30aeb3799a402b.html">bogus result of "select" with negative "offset" and no "sortby"</a> 
       </td>
       <td> created </td>
     </tr>
@@ -408,7 +408,7 @@ <h2>Recent activity for this release</h2>
     <tr class="even-row">
       <td class="date">2009-11-25</td>
       <td class="issuename">
-        <a href="issue-44a8e2ec39e44e46fbb0be2e73b1250f7b21cc77.html">can't specify path of log files, also reopen it</a> 
+        <a href="issue-df04c90c558d74906fd043ff0a58bd2d5fcda92c.html">"drilldown_output_columns" of "select" and "*"</a> 
       </td>
       <td> created </td>
     </tr>
@@ -417,7 +417,7 @@ <h2>Recent activity for this release</h2>
     <tr class="odd-row">
       <td class="date">2009-11-25</td>
       <td class="issuename">
-        <a href="issue-bccd6f0d7dca854657e5d40de27dea9a506bcd1b.html">parse0, parse4... bit field</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
+        <a href="issue-44a8e2ec39e44e46fbb0be2e73b1250f7b21cc77.html">can't specify path of log files, also reopen it</a> 
       </td>
       <td> created </td>
     </tr>
@@ -426,7 +426,7 @@ <h2>Recent activity for this release</h2>
     <tr class="even-row">
       <td class="date">2009-11-25</td>
       <td class="issuename">
-        <a href="issue-c804446bb766b21c53313bc888a2bc93ddaec0aa.html">missing null checks</a> 
+        <a href="issue-bccd6f0d7dca854657e5d40de27dea9a506bcd1b.html">parse0, parse4... bit field</a> <img title="fixed" src="green-check.png" class="inline-status-image" alt="fixed"/>
       </td>
       <td> created </td>
     </tr>
@@ -435,7 +435,7 @@ <h2>Recent activity for this release</h2>
     <tr class="odd-row">
       <td class="date">2009-11-25</td>
       <td class="issuename">
-        <a href="issue-a4d0fff53122fd0a48c91db4379a50b29ad6a55f.html">"table_create" should support creating of temporary tables</a> 
+        <a href="issue-c804446bb766b21c53313bc888a2bc93ddaec0aa.html">missing null checks</a> 
       </td>
       <td> created </td>
     </tr>

diff --git a/doc/issues/issue-40ba77e1ab1d76f669ec8e158e04e97d6184d8e9.yaml b/doc/issues/issue-40ba77e1ab1d76f669ec8e158e04e97d6184d8e9.yaml
@@ -5,8 +5,8 @@ type: :feature
 component: groonga
 release: 1.0.0
 reporter: daijiro <daijiro.mori@gmail.com>
-status: :unstarted
-disposition: 
+status: :closed
+disposition: :fixed
 creation_time: 2009-11-24 13:44:55.871925 Z
 references: []
 
@@ -16,3 +16,7 @@ log_events:
   - daijiro <daijiro.mori@gmail.com>
   - created
   - ""
+- - 2009-11-30 04:43:51.019389 Z
+  - Ryo Onodera <onodera@clear-code.com>
+  - closed with disposition fixed
+  - ""
diff --git a/lib/db.c b/lib/db.c
@@ -9665,7 +9665,7 @@ grn_select(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
       grn_text_itoa(ctx, outbuf, ctx->rc);
       break;
     case GRN_CONTENT_XML:
-      GRN_TEXT_PUTS(ctx, outbuf, "<?xml version=\"1.0\" encoding=\"utf-8\" ?><SEGMENTS><SEGMENT><RESULTPAGE>");
+      GRN_TEXT_PUTS(ctx, outbuf, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<SEGMENTS><SEGMENT><RESULTPAGE>");
       break;
     case GRN_CONTENT_TSV:
       grn_text_itoa(ctx, outbuf, ctx->rc);
@@ -9857,7 +9857,7 @@ grn_select(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
       GRN_TEXT_PUTC(ctx, outbuf, '\n');
       break;
     case GRN_CONTENT_XML:
-      GRN_TEXT_PUTS(ctx, outbuf, "</RESULTPAGE></SEGMENT></SEGMENTS>");
+      GRN_TEXT_PUTS(ctx, outbuf, "</RESULTPAGE></SEGMENT></SEGMENTS>\n");
       break;
     case GRN_CONTENT_NONE:
       break;

diff --git a/lib/str.c b/lib/str.c
@@ -2555,7 +2555,7 @@ grn_text_otoxml(grn_ctx *ctx, grn_obj *bulk, grn_obj *obj, grn_obj_format *forma
         grn_text_itoa(ctx, bulk, format->limit);
         GRN_TEXT_PUTS(ctx, bulk, "\" NHITS=\"");
         grn_text_itoa(ctx, bulk, format->nhits);
-        GRN_TEXT_PUTS(ctx, bulk, "\">");
+        GRN_TEXT_PUTS(ctx, bulk, "\">\n");
         break;
       case GRN_OBJ_FORMAT_XML_ELEMENT_NAVIGATIONENTRY:
         GRN_ASSERT(ncolumns == 2);
@@ -2585,9 +2585,9 @@ grn_text_otoxml(grn_ctx *ctx, grn_obj *bulk, grn_obj *obj, grn_obj_format *forma
             grn_obj_get_value_o(ctx, columns[j], &id, &buf);
             grn_text_otoxml(ctx, bulk, &buf, NULL);
 
-            GRN_TEXT_PUTS(ctx, bulk, "</FIELD>");
+            GRN_TEXT_PUTS(ctx, bulk, "</FIELD>\n");
           }
-          GRN_TEXT_PUTS(ctx, bulk, "</HIT>");
+          GRN_TEXT_PUTS(ctx, bulk, "</HIT>\n");
           break;
         case GRN_OBJ_FORMAT_XML_ELEMENT_NAVIGATIONENTRY:
           GRN_TEXT_PUTS(ctx, bulk, "<NAVIGATIONELEMENT NAME=\"");

diff --git a/test/unit/http/test-http-select.rb b/test/unit/http/test-http-select.rb
@@ -658,6 +658,26 @@ def test_drilldown_output_columns_wild_card
                      :drilldown_output_columns => "* _key")
   end
 
+  def test_xml
+    populate_users
+
+    expected = <<EOF
+<?xml version="1.0" encoding="utf-8" ?>
+<SEGMENTS><SEGMENT><RESULTPAGE><RESULTSET OFFSET="0" LIMIT="10" NHITS="2">
+<HIT NO="1"><FIELD NAME="_id">2</FIELD>
+<FIELD NAME="_key">hayamiz</FIELD>
+<FIELD NAME="real_name">Yuto Hayamizu</FIELD>
+<FIELD NAME="hp">200</FIELD>
+</HIT>
+<HIT NO="2"><FIELD NAME="_id">1</FIELD>
+<FIELD NAME="_key">ryoqun</FIELD>
+<FIELD NAME="real_name">Ryo Onodera</FIELD>
+<FIELD NAME="hp">200</FIELD>
+</HIT>
+</RESULTSET></RESULTPAGE></SEGMENT></SEGMENTS>
+EOF
+    assert_select_xml(expected, :table => "users")
+  end
   private
   def create_user_id_table
     table_create("user_id", :flags => Table::HASH_KEY, :key_type => "Int32")

diff --git a/test/unit/lib/ruby/groonga-http-test-utils.rb b/test/unit/lib/ruby/groonga-http-test-utils.rb
@@ -61,8 +61,9 @@ def encode_options(options)
     end.compact.join("&")
   end
 
-  def command_path(command, options={})
+  def command_path(command, options={}, output_type=nil)
     path = "/d/#{command}"
+    path += ".#{output_type}" if output_type
     encoded_options = encode_options(options)
     path += "?#{encoded_options}" unless encoded_options.empty?
     path
@@ -183,6 +184,8 @@ def assert_response(expected, response, options=nil)
       actual = JSON.parse(response.body)
     when "text/html"
       actual = response.body
+    when "text/xml"
+      actual = response.body
     else
       flunk("unknown content-type: #{response.content_type}")
     end
@@ -206,4 +209,15 @@ def assert_select(header, expected, parameters, options={}, &block)
                     :content_type => "application/json",
                     &block)
   end
+
+  def assert_select_xml(expected, parameters, options={}, &block)
+    command_name = options[:command] || :select
+    response = get(command_path(command_name, parameters, "xml"))
+
+    output_type = options[:output_type] || "json"
+    assert_response(expected,
+                    response,
+                    :content_type => "text/xml",
+                    &block)
+  end
 end