From 6ea592db1763e2ee113e376b5cc407abd23fd445 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 23 Sep 2011 12:06:15 +0800 Subject: [PATCH] Pman.SearchTokenizer.js --- Pman.SearchTokenizer.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Pman.SearchTokenizer.js b/Pman.SearchTokenizer.js index ad663e9e..1a3686d5 100644 --- a/Pman.SearchTokenizer.js +++ b/Pman.SearchTokenizer.js @@ -105,18 +105,18 @@ Pman.SearchTokenizer.prototype = { addStr : function (s,q) { //q == quoted.. q = q || false; - s = q ? s : String.trim(s); - if (!strlen(s)) { + s = q ? s : Roo.util.Format.trim(s); + if (!s.length) { return; } + if (!q) { - - if ((strtoupper(s) == 'AND') || (strtoupper(s) == 'OR')) { - this.tokens[] = new Text_SearchParser_Token_Op(strtoupper(s)); + if ((s..toUpperCase() == 'AND') || (s.toUpperCase() == 'OR')) { + this.tokens.push( { type: s.toUpperCase() }); return; } } - this.tokens[] = new Text_SearchParser_Token_String(s); + this.tokens.push( { type : 's' , v : s }); } function getChar() -- 2.39.2