adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 16:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1937 quick search redirects to normal search

Browse Source
This commit is contained in:
plegall
2023-07-03 15:22:52 +02:00
parent 6c6c297b2a
commit c469f5142c
4 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_search.inc.php
+25
View File
@@ -1568,4 +1568,29 @@ function get_search_results($search_id, $super_order_by, $images_where='')
}
}
function split_allwords($raw_allwords)
{
$words = null;
if (!preg_match('/^\s*$/', $raw_allwords))
{
$drop_char_match = array('-','^','$',';','#','&','(',')','<','>','`','\'','"','|',',','@','_','?','%','~','.','[',']','{','}',':','\\','/','=','\'','!','*');
$drop_char_replace = array(' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','', '', ' ',' ',' ',' ','', ' ',' ',' ',' ',' ',' ',' ',' ',' ','' , ' ',' ',' ', ' ',' ');
// Split words
$words = array_unique(
preg_split(
'/\s+/',
str_replace(
$drop_char_match,
$drop_char_replace,
$raw_allwords
)
)
);
}
return $words;
}
?>
include/ws_functions/pwg.images.php
+2 -24
View File
@@ -700,6 +700,7 @@ SELECT *
function ws_images_filteredSearch_update($params, $service)
{
// echo json_encode($params); exit();
include_once(PHPWG_ROOT_PATH.'include/functions_search.inc.php');
// * check the search exists
$query = '
@@ -746,30 +747,7 @@ SELECT id
}
$search['fields']['allwords']['fields'] = $params['allwords_fields'];
$search['fields']['allwords']['words'] = null;
if (!preg_match('/^\s*$/', $params['allwords']))
{
$drop_char_match = array(
'-','^','$',';','#','&','(',')','<','>','`','\'','"','|',',','@','_',
'?','%','~','.','[',']','{','}',':','\\','/','=','\'','!','*'
);
$drop_char_replace = array(
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','','',' ',' ',' ',' ','',' ',
' ',' ',' ',' ',' ',' ',' ',' ','' ,' ',' ',' ',' ',' '
);
// Split words
$search['fields']['allwords']['words'] = array_unique(
preg_split(
'/\s+/',
str_replace(
$drop_char_match,
$drop_char_replace,
$params['allwords']
)
)
);
}
$search['fields']['allwords']['words'] = split_allwords($params['allwords']);
}
if (isset($params['tags']))