Changeset 28064 for trunk/include

Timestamp:

Apr 3, 2014, 9:46:10 PM (11 years ago)

Author:

rvelices

Message:

bug 3056: quick search - fix + prepare for scoped/range searches

File:

• trunk/include/functions_search.inc.php (modified) (9 diffs)

trunk/include/functions_search.inc.php

@@ -310 +310 @@
 {
   var $is_single = true;
-  var $token; /* the actual word/phrase string*/
+  var $term; /* the actual word/phrase string*/
   var $idx;
 
-  function __construct($token)
-  {
-    $this->token = $token;
+  function __construct($term)
+  {
+    $this->term = $term;
+  }
+  
+  function __toString()
+  {
+    return $this->term;
   }
 }
@@ -350 +355 @@
       else
       {
-        $s .= $this->tokens[$i]->token;
+        $s .= $this->tokens[$i];
       }
       if ($modifier & QST_QUOTED)
@@ -438 +443 @@
           {
             $crt_modifier |= QST_WILDCARD_END;
-            $ai++;
+            $qi++;
           }
           $this->push($crt_token, $crt_modifier);
@@ -458 +463 @@
         if ( ($this->token_modifiers[$i]&QST_QUOTED)==0 )
         {
-          if ('not' == strtolower($token->token))
+          if ('not' == strtolower($token->term))
           {
             if ($i+1 < count($this->tokens))
               $this->token_modifiers[$i+1] |= QST_NOT;
-            $token->token = "";
+            $token->term = "";
           }
-          if ('or' == strtolower($token->token))
+          if ('or' == strtolower($token->term))
           {
             if ($i+1 < count($this->tokens))
               $this->token_modifiers[$i+1] |= QST_OR;
-            $token->token = "";
+            $token->term = "";
           }
-          if ('and' == strtolower($token->token))
+          if ('and' == strtolower($token->term))
           {
-            $token->token = "";
+            $token->term = "";
           }
-          if ( substr($token->token, -1)=='*' )
+          if ( substr($token->term, -1)=='*' )
           {
-            $token->token = rtrim($token->token, '*');
+            $token->term = rtrim($token->term, '*');
             $this->token_modifiers[$i] |= QST_WILDCARD_END;
           }
         }
-        if (!strlen($token->token))
+        if (!strlen($token->term))
           $remove = true;
       }
@@ -568 +573 @@
       {
         $token->idx = count($this->stokens);
-        $this->stokens[] = $token->token;
+        $this->stokens[] = $token;
 
         $modifier = $expr->token_modifiers[$i];
@@ -614 +619 @@
   for ($i=0; $i<count($expr->stokens); $i++)
   {
-    $token = $expr->stokens[$i];
+    $token = $expr->stokens[$i]->term;
     $clauses = array();
 
@@ -674 +679 @@
   foreach ($tokens as $token)
   {
-    $transliterated_tokens[] = transliterate($token);
+    $transliterated_tokens[] = transliterate($token->term);
   }
 
@@ -844 +849 @@
       $crt_ids = $qsr->iids[$crt->idx] = array_unique( array_merge($qsr->images_iids[$crt->idx], $qsr->tag_iids[$crt->idx]) );
       $crt_qualifies = count($crt_ids)>0 || count($qsr->tag_ids[$crt->idx])>0;
-      $crt_ignored_terms = $crt_qualifies ? array() : array($crt->token);
+      $crt_ignored_terms = $crt_qualifies ? array() : array($crt->term);
     }
     else
@@ -921 +926 @@
   {
     $debug[] = $expression->stokens[$i].': '.count($qsr->tag_ids[$i]).' tags, '.count($qsr->tag_iids[$i]).' tiids, '.count($qsr->images_iids[$i]).' iiids, '.count($qsr->iids[$i]).' iids'
-      .( !empty($qsr->variants[$expression->stokens[$i]]) ? ' variants: '.implode(', ',$qsr->variants[$expression->stokens[$i]]): '');
+      .( !empty($qsr->variants[$expression->stokens[$i]->term]) ? ' variants: '.implode(', ',$qsr->variants[$expression->stokens[$i]->term]): '');
   }
   $debug[] = 'before perms '.count($ids);