From 1294f5df57c956b93232aa1635f6574c055825f8 Mon Sep 17 00:00:00 2001
From: Benoit Chesneau <benoitc@apache.org>
Date: Sat, 5 Jun 2010 22:37:45 +0000
Subject: fix #COUCHDB-787 . thanks!

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@951786 13f79535-47bb-0310-9956-ffa450edef68
---
 share/www/script/test/rewrite.js    | 11 +++++++++++
 src/couchdb/couch_httpd_rewrite.erl | 14 ++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/share/www/script/test/rewrite.js b/share/www/script/test/rewrite.js
index d3888d9a..66b33d74 100644
--- a/share/www/script/test/rewrite.js
+++ b/share/www/script/test/rewrite.js
@@ -137,6 +137,13 @@ couchTests.rewrite = function(debug) {
               "query": {
                 "key": [":a", ":b"]
               }
+            },
+            {
+              "from": "simpleForm/complexView6",
+              "to": "_list/simpleForm/complexView3",
+              "query": {
+                "key": [":a", ":b"]
+              }
             }
           ],
           lists: {
@@ -331,6 +338,10 @@ couchTests.rewrite = function(debug) {
         T(xhr.status == 200, "with query params");
         T(/Value: doc 4/.test(xhr.responseText));
         
+        xhr = CouchDB.request("GET", "/test_suite_db/_design/test/_rewrite/simpleForm/complexView6?a=test&b=essai");
+        T(xhr.status == 200, "with query params");
+        T(/Value: doc 4/.test(xhr.responseText));
+        
         // test path relative to server
         designDoc.rewrites.push({
            "from": "uuids",
diff --git a/src/couchdb/couch_httpd_rewrite.erl b/src/couchdb/couch_httpd_rewrite.erl
index 4c783e15..6c909994 100644
--- a/src/couchdb/couch_httpd_rewrite.erl
+++ b/src/couchdb/couch_httpd_rewrite.erl
@@ -118,6 +118,7 @@ handle_rewrite_req(#httpd{
     DesignId = <<"_design/", DesignName/binary>>,
     Prefix = <<"/", DbName/binary, "/", DesignId/binary>>,
     QueryList = couch_httpd:qs(Req),
+    QueryList1 = [{to_atom(K), V} || {K, V} <- QueryList],
 
     #doc{body={Props}} = DDoc,
 
@@ -132,7 +133,7 @@ handle_rewrite_req(#httpd{
 
             %% get raw path by matching url to a rule.
             RawPath = case try_bind_path(DispatchList, Method, PathParts,
-                                    QueryList) of
+                                    QueryList1) of
                 no_dispatch_path ->
                     throw(not_found);
                 {NewPathParts, Bindings} ->
@@ -146,7 +147,7 @@ handle_rewrite_req(#httpd{
                             [] -> [];
                             _ -> [$?, encode_query(Bindings)]
                         end),
-
+                    
                     % if path is relative detect it and rewrite path
                     case mochiweb_util:safe_relative_path(Path) of
                         undefined ->
@@ -199,7 +200,7 @@ try_bind_path([Dispatch|Rest], Method, PathParts, QueryList) ->
                     % we parse query args from the rule and fill
                     % it eventually with bindings vars
                     QueryArgs1 = make_query_list(QueryArgs, Bindings1, []),
-
+                    
                     % remove params in QueryLists1 that are already in
                     % QueryArgs1
                     Bindings2 = lists:foldl(fun({K, V}, Acc) ->
@@ -247,8 +248,13 @@ replace_var(Key, Value, Bindings) ->
             Value1 = lists:foldr(fun(V, Acc) ->
                 V1 = case V of
                     <<":", VName/binary>> ->
-                        get_var(VName, Bindings, V);
+                        case get_var(VName, Bindings, V) of
+                            V2 when is_list(V2) ->
+                                iolist_to_binary(V2);
+                            V2 -> V2
+                        end;
                     _ ->
+                        
                         V
                 end,
                 [V1|Acc]
-- 
cgit v1.2.3