From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 15 Jul 2015 10:15:00 +0000 (+0300)
Subject: af_psql_trgm: enable checking for similar articles in the source feed as long as... 
X-Git-Tag: 16.3~218
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9264ec7055de0ccf5f592af04519feb46db5c6b1;p=tt-rss.git

af_psql_trgm: enable checking for similar articles in the source feed as long as guid is different
---

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 26385114..ad24559c 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -270,7 +270,7 @@ class Af_Psql_Trgm extends Plugin {
 
 
 		$owner_uid = $article["owner_uid"];
-		$feed_id = $article["feed"]["id"];
+		$entry_guid = $article["guid_hashed"];
 		$title_escaped = db_escape_string($article["title"]);
 
 		// trgm does not return similarity=1 for completely equal strings
@@ -279,7 +279,7 @@ class Af_Psql_Trgm extends Plugin {
 		  FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
 		  date_entered >= NOW() - interval '1 day' AND
 		  title = '$title_escaped' AND
-		  feed_id != '$feed_id' AND
+		  guid != '$entry_guid' AND
 		  owner_uid = $owner_uid");
 
 		$nequal = db_fetch_result($result, 0, "nequal");
@@ -293,7 +293,7 @@ class Af_Psql_Trgm extends Plugin {
 		$result = db_query("SELECT MAX(SIMILARITY(title, '$title_escaped')) AS ms
 		  FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
 		  date_entered >= NOW() - interval '1 day' AND
-		  feed_id != '$feed_id' AND
+		  guid != '$entry_guid' AND
 		  owner_uid = $owner_uid");
 
 		$similarity_result = db_fetch_result($result, 0, "ms");