Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 30078 invoked from network); 7 Jan 2009 17:33:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jan 2009 17:33:54 -0000 Received: (qmail 41950 invoked by uid 500); 7 Jan 2009 17:33:54 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 41926 invoked by uid 500); 7 Jan 2009 17:33:54 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 41902 invoked by uid 99); 7 Jan 2009 17:33:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2009 09:33:54 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2009 17:33:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F070238896F; Wed, 7 Jan 2009 09:33:33 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r732407 - in /couchdb/trunk: THANKS src/couchdb/couch_httpd_view.erl Date: Wed, 07 Jan 2009 17:33:32 -0000 To: commits@couchdb.apache.org From: jchris@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090107173333.4F070238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jchris Date: Wed Jan 7 09:33:31 2009 New Revision: 732407 URL: http://svn.apache.org/viewvc?rev=732407&view=rev Log: apply patch to fix include docs q param parsing Modified: couchdb/trunk/THANKS couchdb/trunk/src/couchdb/couch_httpd_view.erl Modified: couchdb/trunk/THANKS URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=732407&r1=732406&r2=732407&view=diff ============================================================================== --- couchdb/trunk/THANKS (original) +++ couchdb/trunk/THANKS Wed Jan 7 09:33:31 2009 @@ -19,6 +19,7 @@ * Adam Kocoloski * Roger Leigh * Jim Lindley + * Hunter Morris * Sam Ruby * Dirk Schalge * Carlos Valiente Modified: couchdb/trunk/src/couchdb/couch_httpd_view.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_view.erl?rev=732407&r1=732406&r2=732407&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_httpd_view.erl (original) +++ couchdb/trunk/src/couchdb/couch_httpd_view.erl Wed Jan 7 09:33:31 2009 @@ -306,19 +306,6 @@ {"reduce", "false"} -> Args#view_query_args{reduce=false}; {"include_docs", Value} -> - case IsReduce of - true -> - #view_query_args{reduce=OptReduce} = Args, - case OptReduce of - true -> - Msg = lists:flatten(io_lib:format("Bad URL query key for reduce operation: ~s", [Key])), - throw({query_parse_error, Msg}); - _ -> - ok - end; - _ -> - ok - end, case Value of "true" -> Args#view_query_args{include_docs=true}; @@ -334,6 +321,18 @@ throw({query_parse_error, Msg}) end end, #view_query_args{}, QueryList), + case IsReduce of + true -> + case QueryArgs#view_query_args.include_docs and QueryArgs#view_query_args.reduce of + true -> + ErrMsg = "Bad URL query key for reduce operation: include_docs", + throw({query_parse_error, ErrMsg}); + _ -> + ok + end; + _ -> + ok + end, case Keys of nil -> QueryArgs;