aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2014-05-13 20:09:04 +0000
committerrvelices <rv-github@modusoptimus.com>2014-05-13 20:09:04 +0000
commitf2c42c791efc4797ed22d8ca87518780ced759cb (patch)
treeb7a99475172468ef4597ac43651f9cac26acefb3
parent811e366f727234d907c16f92f0da8e8863fe3e3c (diff)
bug 3056: quick search - cache results for 5 minutes + comments + small fix
git-svn-id: http://piwigo.org/svn/trunk@28459 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/batch_manager.php2
-rw-r--r--include/functions_search.inc.php37
2 files changed, 36 insertions, 3 deletions
diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index e041a8507..b1e022ebc 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -394,7 +394,7 @@ SELECT id
if (isset($_SESSION['bulk_manager_filter']['search']))
{
include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' );
- $res = get_quick_search_results($_SESSION['bulk_manager_filter']['search']['q'], array('permissions'=>false));
+ $res = get_quick_search_results_no_cache($_SESSION['bulk_manager_filter']['search']['q'], array('permissions'=>false));
$filter_sets[] = $res['items'];
}
diff --git a/include/functions_search.inc.php b/include/functions_search.inc.php
index 1aba9b961..6280c4d9d 100644
--- a/include/functions_search.inc.php
+++ b/include/functions_search.inc.php
@@ -265,6 +265,9 @@ define('QST_WILDCARD_END', 0x10);
define('QST_WILDCARD', QST_WILDCARD_BEGIN|QST_WILDCARD_END);
define('QST_BREAK', 0x20);
+/**
+ * A search scope applies to a single token and restricts the search to a subset of searchable fields.
+ */
class QSearchScope
{
var $id;
@@ -603,8 +606,8 @@ class QMultiToken
$crt_token .= $ch;
break;
}
- if (strlen($crt_token) && isdigit(substr($crt_token,0,-1))
- && $qi+1<strlen($q) && isdigit($q[$qi+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
$crt_token .= $ch;
break;
@@ -703,6 +706,10 @@ class QMultiToken
}
}
+ /**
+ * 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)'
+ */
private function apply_scope(QSearchScope $scope)
{
for ($i=0; $i<count($this->tokens); $i++)
@@ -1061,6 +1068,7 @@ function qsearch_eval(QMultiToken $expr, QResults $qsr, &$qualifies, &$ignored_t
return $ids;
}
+
/**
* Returns the search results corresponding to a quick/query search.
* A quick/query search returns many items (search is not strict), but results
@@ -1082,6 +1090,31 @@ function qsearch_eval(QMultiToken $expr, QResults $qsr, &$qualifies, &$ignored_t
*/
function get_quick_search_results($q, $options)
{
+ global $persistent_cache, $conf, $user;
+
+ $cache_key = $persistent_cache->make_key( array(
+ strtolower($q),
+ $conf['order_by'],
+ $user['id'],$user['cache_update_time'],
+ isset($options['permissions']) ? (boolean)$options['permissions'] : true,
+ isset($options['images_where']) ? $options['images_where'] : '',
+ ) );
+ if ($persistent_cache->get($cache_key, $res))
+ {
+ return $res;
+ }
+
+ $res = get_quick_search_results_no_cache($q, $options);
+
+ $persistent_cache->set($cache_key, $res, 300);
+ return $res;
+}
+
+/**
+ * @see get_quick_search_results but without result caching
+ */
+function get_quick_search_results_no_cache($q, $options)
+{
global $conf;
//@TODO: maybe cache for 10 minutes the result set to avoid many expensive sql calls when navigating the pictures
$q = trim(stripslashes($q));