couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cml...@apache.org
Subject svn commit: r737859 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in share/www/database.html share/www/script/couch.js share/www/script/futon.browse.js share/www/script/jquery.couch.js src/couchdb/couch_httpd_view.erl
Date Mon, 26 Jan 2009 21:22:19 GMT
Author: cmlenz
Date: Mon Jan 26 21:22:18 2009
New Revision: 737859

URL: http://svn.apache.org/viewvc?rev=737859&view=rev
Log:
Change _slow_view back to _temp_view, as discussed on the mailing list (see http://markmail.org/message/o44cafucgwlpudov).

Modified:
    couchdb/trunk/etc/couchdb/default.ini.tpl.in
    couchdb/trunk/share/www/database.html
    couchdb/trunk/share/www/script/couch.js
    couchdb/trunk/share/www/script/futon.browse.js
    couchdb/trunk/share/www/script/jquery.couch.js
    couchdb/trunk/src/couchdb/couch_httpd_view.erl

Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=737859&r1=737858&r2=737859&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Mon Jan 26 21:22:18 2009
@@ -49,7 +49,7 @@
 
 [httpd_db_handlers]
 _view = {couch_httpd_view, handle_view_req}
-_slow_view = {couch_httpd_view, handle_slow_view_req}
+_temp_view = {couch_httpd_view, handle_temp_view_req}
 _show = {couch_httpd_show, handle_doc_show_req}
 _list = {couch_httpd_show, handle_view_list_req}
 

Modified: couchdb/trunk/share/www/database.html
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/database.html?rev=737859&r1=737858&r2=737859&view=diff
==============================================================================
--- couchdb/trunk/share/www/database.html [utf-8] (original)
+++ couchdb/trunk/share/www/database.html [utf-8] Mon Jan 26 21:22:18 2009
@@ -40,7 +40,7 @@
         if (page.redirecting) return;
         $("h1 strong").text(page.db.name);
         var viewPath = (page.viewName || "_all_docs").replace(/^_design\//, "_view/");
-        if (viewPath != "_slow_view" && viewPath != "_design_docs") {
+        if (viewPath != "_temp_view" && viewPath != "_design_docs") {
           $("h1 a.raw").attr("href", "/" + encodeURIComponent(page.db.name) +
             "/" + viewPath);
         }
@@ -118,7 +118,7 @@
         <label>Select view: <select autocomplete="false">
           <option value="_all_docs">All documents</option>
           <option value="_design_docs">Design documents</option>
-          <option value="_slow_view">Custom query…</option>
+          <option value="_temp_view">Custom query…</option>
         </select></label>
       </div>
       <ul id="toolbar">

Modified: couchdb/trunk/share/www/script/couch.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch.js?rev=737859&r1=737858&r2=737859&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/couch.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch.js [utf-8] Mon Jan 26 21:22:18 2009
@@ -129,7 +129,7 @@
         reduceFun = reduceFun.toSource ? reduceFun.toSource() : "(" + reduceFun.toString()
+ ")";
       body.reduce = reduceFun;
     }
-    this.last_req = this.request("POST", this.uri + "_slow_view" + encodeOptions(options),
{
+    this.last_req = this.request("POST", this.uri + "_temp_view" + encodeOptions(options),
{
       headers: {"Content-Type": "application/json"},
       body: JSON.stringify(body)
     });

Modified: couchdb/trunk/share/www/script/futon.browse.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/futon.browse.js?rev=737859&r1=737858&r2=737859&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/futon.browse.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/futon.browse.js [utf-8] Mon Jan 26 21:22:18 2009
@@ -114,7 +114,7 @@
       this.viewLanguage = "javascript";
       this.db = db;
       this.isDirty = false;
-      this.isTempView = viewName == "_slow_view";
+      this.isTempView = viewName == "_temp_view";
       page = this;
 
       var templates = {
@@ -199,7 +199,7 @@
             }
             $("#language").change(updateDirtyState);
           });
-        } else if (viewName == "_slow_view") {
+        } else if (viewName == "_temp_view") {
           page.viewLanguage = $.cookies.get(db.name + ".language", page.viewLanguage);
           page.updateViewEditor(
             $.cookies.get(db.name + ".map", templates[page.viewLanguage]),
@@ -266,7 +266,7 @@
           }
         });
         if (!viewName.match(/^_design\//)) {
-          $.each(["_all_docs", "_design_docs", "_slow_view"], function(idx, name) {
+          $.each(["_all_docs", "_design_docs", "_temp_view"], function(idx, name) {
             if (viewName == name) {
               select[0].options[idx].selected = true;
             }
@@ -577,7 +577,7 @@
           $("#switch select")[0].selectedIndex = 0;
           db.allDocs(options);
         } else {
-          if (viewName == "_slow_view") {
+          if (viewName == "_temp_view") {
             $("#viewcode").show().removeClass("collapsed");
             var mapFun = $("#viewcode_map").val();
             $.cookies.set(db.name + ".map", mapFun);

Modified: couchdb/trunk/share/www/script/jquery.couch.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/jquery.couch.js?rev=737859&r1=737858&r2=737859&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/jquery.couch.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/jquery.couch.js [utf-8] Mon Jan 26 21:22:18 2009
@@ -249,7 +249,7 @@
             body.reduce = reduceFun;
           }
           $.ajax({
-            type: "POST", url: this.uri + "_slow_view" + encodeOptions(options),
+            type: "POST", url: this.uri + "_temp_view" + encodeOptions(options),
             contentType: "application/json",
             data: toJSON(body), dataType: "json",
             complete: function(req) {

Modified: couchdb/trunk/src/couchdb/couch_httpd_view.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_view.erl?rev=737859&r1=737858&r2=737859&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd_view.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_view.erl Mon Jan 26 21:22:18 2009
@@ -13,7 +13,7 @@
 -module(couch_httpd_view).
 -include("couch_db.hrl").
 
--export([handle_view_req/2,handle_slow_view_req/2]).
+-export([handle_view_req/2,handle_temp_view_req/2]).
 
 -export([parse_view_query/1,parse_view_query/2,make_view_fold_fun/5,
     finish_view_fold/3, view_row_obj/3]).
@@ -58,7 +58,7 @@
 handle_view_req(Req, _Db) ->
     send_method_not_allowed(Req, "GET,POST,HEAD").
 
-handle_slow_view_req(#httpd{method='POST'}=Req, Db) ->
+handle_temp_view_req(#httpd{method='POST'}=Req, Db) ->
     QueryArgs = parse_view_query(Req),
 
     case couch_httpd:primary_header_value(Req, "content-type") of
@@ -80,7 +80,7 @@
         output_reduce_view(Req, View, QueryArgs, Keys)
     end;
 
-handle_slow_view_req(Req, _Db) ->
+handle_temp_view_req(Req, _Db) ->
     send_method_not_allowed(Req, "POST").
 
 output_map_view(Req, View, Db, QueryArgs, nil) ->



Mime
View raw message