X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.SearchTokenizer.js;h=8db0be1b8579dbfad2a4dac29c7e41c7d518e78a;hp=1a3686d5cb95373653344f9acdb6dff836b2b373;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=6ea592db1763e2ee113e376b5cc407abd23fd445

diff --git a/Pman.SearchTokenizer.js b/Pman.SearchTokenizer.js
index 1a3686d5..8db0be1b 100644
--- a/Pman.SearchTokenizer.js
+++ b/Pman.SearchTokenizer.js
@@ -14,8 +14,8 @@
  
 Pman.SearchTokenizer = function(s)
 {
-        this.str = s;
-        this.strlen = s.length;
+        this.str = typeof(s) == 'string' ? s : '';
+        this.strlen = typeof(s) == 'string' ? s.length : 0;
         this.i = 0;
         this.tokens = [];
        //print_r(this);
@@ -49,6 +49,10 @@ Pman.SearchTokenizer.prototype =  {
                
             }
         }
+        // sort tokens longest first..
+        
+        
+        
         // should not get here...
         return this.tokens;
     },
@@ -111,29 +115,33 @@ Pman.SearchTokenizer.prototype =  {
         }
         
         if (!q) {
-            if ((s..toUpperCase() == 'AND') || (s.toUpperCase() == 'OR')) {
+            if ((s.toUpperCase() == 'AND') || (s.toUpperCase() == 'OR')) {
                 this.tokens.push( { type: s.toUpperCase() });
                 return;
             }
         }
-        this.tokens.push( { type : 's' , v : s });
-    }
+        this.tokens.push( { type : 's' , v : s, q: q });
+    },
     
-    function getChar()
+    getChar : function ()
     {
+        
         if (this.i >= this.strlen) {
             return false;
         }
         c = this.str[this.i];
         this.i++;
         return c;
-    }
-    function ungetChar()
+    },
+    ungetChar : function ()
     {
         this.i--;
     }
-    
-    
-    
+     
+};
+
+Pman.SearchTokenizer.parse = function(v) {
+    var x = new Pman.SearchTokenizer(v);
+    return x.parse();
     
 }
\ No newline at end of file