mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

fix fulltext search for types other than mysql

Browse Source
This commit is contained in:
Garvin Hicking
2015-01-05 11:22:22 +01:00
parent e571ca1def
commit afa74da11c
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -3,6 +3,9 @@
Version 2.0 () Version 2.0 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Fix searching for entries in the admin panel with database
types other than "mysql"
* Change entry editor's category assignment to toggle between * Change entry editor's category assignment to toggle between
a hierarchical and a plain list (good for many categories) a hierarchical and a plain list (good for many categories)

30
include/admin/entries.inc.php
View File

@ -261,8 +261,34 @@ switch($serendipity['GET']['adminAction']) {
} }
if (!empty($serendipity['GET']['filter']['body'])) { if (!empty($serendipity['GET']['filter']['body'])) {
if ($serendipity['dbType'] == 'mysql') { $term = serendipity_db_escape_string($serendipity['GET']['filter']['body']);
$filter[] = "MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($serendipity['GET']['filter']['body']) . "')"; if ($serendipity['dbType'] == 'postgres' || $serendipity['dbType'] == 'pdo-postgres') {
$r = serendipity_db_query("SELECT count(routine_name) AS counter
FROM information_schema.routines
WHERE routine_name LIKE 'to_tsvector'
AND specific_catalog = '" . $serendipity['dbName'] . "'");
if (is_array($r) && $r[0]['counter'] > 0) {
$term = str_replace('&', '&', $term);
$filter[] = "(
to_tsvector('english', title) @@to_tsquery('$term') OR
to_tsvector('english', body) @@to_tsquery('$term') OR
to_tsvector('english', extended) @@to_tsquery('$term')
)";
} else {
$filter[] = "(title ILIKE '%$term%' OR body ILIKE '%$term%' OR extended ILIKE '%$term%')";
}
$full = true;
} elseif ($serendipity['dbType'] == 'sqlite' || $serendipity['dbType'] == 'sqlite3' || $serendipity['dbType'] == 'pdo-sqlite' || $serendipity['dbType'] == 'sqlite3oo') {
$term = str_replace('*', '%', $term);
$term = serendipity_mb('strtolower', $term);
$filter[] = "(lower(title) LIKE '%$term%' OR lower(body) LIKE '%$term%' OR lower(extended) LIKE '%$term%')";
$full = true;
} else {
if (preg_match('@["\+\-\*~<>\(\)]+@', $term)) {
$filter[] = "MATCH (title,body,extended) AGAINST ('" . $term . "' IN BOOLEAN MODE)";
} else {
$filter[] = "MATCH (title,body,extended) AGAINST ('" . $term . "')";
}
$full = true; $full = true;
} }
} }