Changeset 28579

Timestamp:

May 31, 2014, 8:50:30 PM (10 years ago)

Author:

rvelices

Message:

quick search - small fixes & improvements
available number of comments per user do not use visible_categories (only forbidden)

Location:

trunk/include

Files:

• functions.inc.php (modified) (4 diffs)
• functions_search.inc.php (modified) (7 diffs)

trunk/include/functions.inc.php

@@ -1177 +1177 @@
     $dbValue = $value;
   }
-  
+
   $query = '
 INSERT INTO
@@ -1184 +1184 @@
   ON DUPLICATE KEY UPDATE value = \''.$dbValue.'\'
 ;';
-  
+
   pwg_query($query);
-  
+
   if ($updateGlobal)
   {
@@ -1369 +1369 @@
     return $conf['filter_pages'][$page_name][$value_name];
   }
-  else if (isset($conf['filter_pages']['default'][$value_name]))
+  elseif (isset($conf['filter_pages']['default'][$value_name]))
   {
     return $conf['filter_pages']['default'][$value_name];
@@ -1995 +1995 @@
           (
             'forbidden_categories' => 'category_id',
-            'visible_categories' => 'category_id',
-            'visible_images' => 'ic.image_id'
+            'forbidden_images' => 'ic.image_id'
           ),
         '', true

trunk/include/functions_search.inc.php

@@ -607 +607 @@
               break;
             }
-            if (strlen($crt_token) && preg_match('/[0-9]/', substr($crt_token,-1)) 
+            if (strlen($crt_token) && preg_match('/[0-9]/', substr($crt_token,-1))
               && $qi+1<strlen($q) && preg_match('/[0-9]/', $q[$qi+1]))
             {// dot between digits is not a separator e.g. F2.8
@@ -708 +708 @@
 
   /**
-  * Applies recursively a search scope to all sub single tokens. We allow 'tag:(John Bill)' but we cannot evaluate 
+  * Applies recursively a search scope to all sub single tokens. We allow 'tag:(John Bill)' but we cannot evaluate
   * scopes on expressions so we rewrite as '(tag:John tag:Bill)'
   */
@@ -844 +844 @@
     if ($use_ft)
     {
-      $max = max( array_map( 'mb_strlen', 
-        preg_split('/['.preg_quote('!"#$%&()*+,./:;<=>?@[\]^`{|}~','/').']+/', $variant, PREG_SPLIT_NO_EMPTY)
+      $max = max( array_map( 'mb_strlen',
+        preg_split('/['.preg_quote('-\'!"#$%&()*+,./:;<=>?@[\]^`{|}~','/').']+/', $variant)
         ) );
       if ($max<4)
@@ -967 +967 @@
   for ($i=0; $i<count($expr->stokens)-1; $i++)
   {
-    if ( (strlen($expr->stokens[$i])<=3 || strlen($expr->stokens[$i+1])<=3)
+    if ( (strlen($expr->stokens[$i]->term)<=3 || strlen($expr->stokens[$i+1]->term)<=3)
       && (($expr->stoken_modifiers[$i] & (QST_QUOTED|QST_WILDCARD)) == 0)
       && (($expr->stoken_modifiers[$i+1] & (QST_BREAK|QST_QUOTED|QST_WILDCARD)) == 0) )
@@ -996 +996 @@
         $not_ids = array_merge($not_ids, $tag_ids);
       else
-        $positive_ids = array_merge($positive_ids, $tag_ids);
+      {
+        if (strlen($token->term)>2 || count($expr->stokens)==1 || isset($token->scope) || ($token->modifier&(QST_WILDCARD|QST_QUOTED)) )
+        {// add tag ids to list only if the word is not too short (such as de / la /les ...)
+          $positive_ids = array_merge($positive_ids, $tag_ids);
+        }
+      }
     }
     elseif (isset($token->scope) && 'tag' == $token->scope->id && strlen($token->term)==0)
     {
-      if ($tokens[$i]->modifier & QST_WILDCARD)
+      if ($token->modifier & QST_WILDCARD)
       {// eg. 'tag:*' returns all tagged images
         $qsr->tag_iids[$i] = query2array('SELECT DISTINCT image_id FROM '.IMAGE_TAG_TABLE, null, 'image_id');
@@ -1096 +1101 @@
     strtolower($q),
     $conf['order_by'],
-    $user['id'],$user['cache_update_time'], 
+    $user['id'],$user['cache_update_time'],
     isset($options['permissions']) ? (boolean)$options['permissions'] : true,
     isset($options['images_where']) ? $options['images_where'] : '',
@@ -1222 +1227 @@
           (
             'forbidden_categories' => 'category_id',
-            'visible_categories' => 'category_id',
-            'visible_images' => 'i.id'
+            'forbidden_images' => 'i.id'
           ),
         null,true