diff options
| author | Andrew Dolgov <[email protected]> | 2015-08-04 13:32:52 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-08-04 13:32:52 +0300 |
| commit | df659891ac0597c3f58b7714ddd4103ccad66b07 (patch) | |
| tree | 919853d7f521e127df753be0615e2fa7c610acb5 /include | |
| parent | e854442e1f402349419be2205ddc47173ab9a3df (diff) | |
implement per-feed stemming language setting
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions2.php | 2 | ||||
| -rw-r--r-- | include/rssfuncs.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/functions2.php b/include/functions2.php index a9bb49df8..551d55d73 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -402,7 +402,7 @@ if (DB_TYPE == "pgsql") { array_push($query_keywords, - "(tsvector_combined @@ '$search_query_leftover'::tsquery)"); + "(tsvector_combined @@ to_tsquery('english', '$search_query_leftover'))"); } } diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 5ebddf9ef..c8e2ce28f 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -306,6 +306,7 @@ feed_url,auth_pass,cache_images, mark_unread_on_update, owner_uid, pubsub_state, auth_pass_encrypted, + feed_language, (SELECT max(date_entered) FROM ttrss_entries, ttrss_user_entries where ref_id = id AND feed_id = '$feed') AS last_article_timestamp FROM ttrss_feeds WHERE id = '$feed'"); @@ -340,6 +341,8 @@ $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images")); $fetch_url = db_fetch_result($result, 0, "feed_url"); + $feed_language = db_escape_string(mb_strtolower(db_fetch_result($result, 0, "feed_language"))); + if (!$feed_language) $feed_language = 'english'; $feed = db_escape_string($feed); @@ -463,6 +466,7 @@ // We use local pluginhost here because we need to load different per-user feed plugins $pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss); + _debug("language: $feed_language", $debug_enabled); _debug("processing feed data...", $debug_enabled); // db_query("BEGIN"); @@ -988,7 +992,7 @@ $tsvector_combined = db_escape_string(mb_substr($entry_title . ' ' . strip_tags($entry_content), 0, 1000000)); - $tsvector_qpart = "tsvector_combined = to_tsvector('simple', '$tsvector_combined'),"; + $tsvector_qpart = "tsvector_combined = to_tsvector('$feed_language', '$tsvector_combined'),"; } else { $tsvector_qpart = ""; |