[Dojo-checkins] kzyp - r15192 - dojox/trunk/data

[dojo-checkins-admin at dojotoolkit.org]

Author: kzyp
Date: Tue Sep  9 09:24:20 2008
New Revision: 15192

Modified:
   dojox/trunk/data/PersevereStore.js
Log:
Fixed client side querying problem

Modified: dojox/trunk/data/PersevereStore.js
==============================================================================
--- dojox/trunk/data/PersevereStore.js	(original)
+++ dojox/trunk/data/PersevereStore.js	Tue Sep  9 09:24:20 2008
@@ -14,7 +14,7 @@
 	_toJsonQuery: function(args){
 
 		// performs conversion of Dojo Data query objects and sort arrays to JSONQuery strings
-		if(typeof args.query == "object"){
+		if(args.query && typeof args.query == "object"){
 			// convert Dojo Data query objects to JSONQuery
 			var jsonQuery = "[?(", first = true;
 			for(var i in args.query){
@@ -37,7 +37,7 @@
 		var sort = args.sort;
 		if(sort){
 			// if we have a sort order, add that to the JSONQuery expression
-			args.queryStr = args.queryStr || args.query || ""; 
+			args.queryStr = args.queryStr || (typeof args.query == 'string' ? args.query : ""); 
 			first = true;
 			for(i = 0; i < sort.length; i++){
 				args.queryStr += (first ? '[' : ',') + (sort[i].descending ? '\\' : '/') + "@[" + dojo._escapeString(sort[i].attribute) + "]";
@@ -70,11 +70,11 @@
 		request._jsonQuery = request._jsonQuery || dojox.json.query(this._toJsonQuery(request)); 
 		return request._jsonQuery([item]).length;
 	},
-	clientSideQuery: function(/*Object*/ request,/*Array*/ baseResults){
+	clientSideFetch: function(/*Object*/ request,/*Array*/ baseResults){
 		if(!dojox.json.query){
 			return this.inherited(arguments);
 		}
-		request._jsonQuery = request._jsonQuery || dojox.json.query(this._toJsonQuery(request)); 
+		request._jsonQuery = request._jsonQuery || dojox.json.query(this._toJsonQuery(request));
 		return request._jsonQuery(baseResults);
 	},
 	querySuperSet: function(argsSuper,argsSub){