Changeset 384 for Dev/branches/rest-dojo-ui/client/rft/elastic

Timestamp:

07/29/12 00:03:52 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Cleanup of the differen ListViews?, List & OrderedList?. Based QuestionListView? on these base classes as well. Removed duplicate code.
• Destroy busy indicator of TabbedQuestionBrowser? (because it's placed outside of the widgets DOM tree, this is not done automatically).
• Use dojo/date/stamp module for uniform and parsable date formatting.
• Added docs/ directory for database format documentation etc.

File:

• Dev/branches/rest-dojo-ui/client/rft/elastic/ElasticReadStore.js (modified) (1 diff)

Dev/branches/rest-dojo-ui/client/rft/elastic/ElasticReadStore.js

@@ -7 +7 @@
     ],function(declare, json, lang, xhr, QueryReadStore) {
 
-        return declare("rft.elastic.ElasticReadStore", QueryReadStore, {
-            fetch:function(request){
-                var attr = Object.keys(request.query)[0];
-                if (request.query[attr].length == 0) {
-                        return 0;
-                }
-                var q = request.query[attr];
+    return declare("rft.elastic.ElasticReadStore", QueryReadStore, {
+        fetch:function(request){
+            var attr = Object.keys(request.query)[0];
+            if (request.query[attr].length == 0) {
+                return 0;
+            }
+            var q = request.query[attr];
 
-                request.serverQuery = json.toJson({ 
-                                                                query: 
-                                                                {
-                                                                        query_string: 
-                                                                        {
-                                                                                default_field: attr, 
-                                                                                query: q
-                                                                        }
-                                                                }
-                                                        });
-                    // Call superclasses' fetch
-                    return this.inherited("fetch", arguments);
-                  },
-                _fetchItems: function(request, fetchHandler, errorHandler){
-                        var serverQuery = request.serverQuery;
-                        var xhrHandler = xhr.post({
+            request.serverQuery = json.toJson({ 
+                query: {
+                    query_string: {
+                        default_field: attr, 
+                        query: q
+                    }
+                }
+            });
+            return this.inherited(arguments);
+          },
+        _fetchItems: function(request, fetchHandler, errorHandler){
+            var serverQuery = request.serverQuery;
+            var xhrHandler = xhr.post({
                 url: this.url,
                 handleAs: "json",
                 postData: serverQuery
+            }).then(lang.hitch(this, function(data){
+                this._xhrFetchHandler(data, request, fetchHandler, errorHandler);
+            }),function(error){
+                errorHandler(error, request);
             });
-                        request.abort = function(){
-                                xhrHandler.cancel();
-                        };
-                        xhrHandler.addCallback(lang.hitch(this, function(data){
-                                this._xhrFetchHandler(data, request, fetchHandler, errorHandler);
-                        }));
-                        xhrHandler.addErrback(function(error){
-                                errorHandler(error, request);
-                        });
-                },
-                _xhrFetchHandler: function(data, request, fetchHandler, errorHandler) {
-                        data = this._filterResponse(data);
-                        this._items = [];
-                        var numHits = data.hits.total || -1;
-                        if(numHits > 0) {
-                                this._items.push({i:data.hits.hits[0]._source, r:this, n:0});
-                        }
-                        fetchHandler(this._items, request, data.hits.total);
-                        this._numRows = data.hits.total;
-                }
-        });
+            request.abort = function(){
+                xhrHandler.cancel();
+            };
+        },
+        _xhrFetchHandler: function(data, request, fetchHandler, errorHandler) {
+            data = this._filterResponse(data);
+            this._items = [];
+            var numHits = data.hits.total || -1;
+            if(numHits > 0) {
+                this._items.push({i:data.hits.hits[0]._source, r:this, n:0});
+            }
+            fetchHandler(this._items, request, data.hits.total);
+            this._numRows = data.hits.total;
+        }
+    });
 })