function save() {
$similarity = (float) db_escape_string($_POST["similarity"]);
$min_title_length = (int) db_escape_string($_POST["min_title_length"]);
+ $enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]) == "true";
if ($similarity < 0) $similarity = 0;
if ($similarity > 1) $similarity = 1;
$this->host->set($this, "similarity", $similarity);
$this->host->set($this, "min_title_length", $min_title_length);
+ $this->host->set($this, "enable_globally", $enable_globally);
- echo T_sprintf("Data saved (%s)", $similarity);
+ echo T_sprintf("Data saved (%s, %d)", $similarity, $enable_globally);
}
function init($host) {
ttrss_entries.id = ref_id AND
ttrss_user_entries.owner_uid = $owner_uid AND
ttrss_entries.id != $id AND
- score >= 0 AND
date_entered >= NOW() - INTERVAL '2 weeks'
ORDER BY
sm DESC, date_entered DESC
smart_date_time(strtotime($line["updated"]))
. "</div>";
- print "<img src='images/score_high.png' title='".sprintf("%.2f", $line['sm'])."'
+ $sm = sprintf("%.2f", $line['sm']);
+ print "<img src='images/score_high.png' title='$sm'
style='vertical-align : middle'>";
$article_link = htmlspecialchars($line["link"]);
print " <a target=\"_blank\" href=\"$article_link\">".
$line["title"]."</a>";
- print " (<a href=\"#\" onclick=\"viewfeed(".$line["feed_id"].")\">".
+ print " (<a href=\"#\" onclick=\"viewfeed({feed:".$line["feed_id"]."})\">".
htmlspecialchars($line["feed_title"])."</a>)";
+ print " <span class='insensitive'>($sm)</span>";
+
print "</li>";
}
$similarity = $this->host->get($this, "similarity");
$min_title_length = $this->host->get($this, "min_title_length");
+ $enable_globally = $this->host->get($this, "enable_globally");
if (!$similarity) $similarity = '0.75';
if (!$min_title_length) $min_title_length = '32';
+ $enable_globally_checked = $enable_globally ? "checked" : "";
+
print "<form dojoType=\"dijit.form.Form\">";
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"af_psql_trgm\">";
- print_notice("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.");
-
- print "<br/>";
+ print "<p>" . __("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") . "</p>";
print_notice("Enable the plugin for specific feeds in the feed editor.");
print "<h3>" . __("Global settings") . "</h3>";
<input dojoType=\"dijit.form.ValidationTextBox\"
placeholder=\"32\"
required=\"1\" name=\"min_title_length\" value=\"$min_title_length\"></td></tr>";
+ print "<tr><td width=\"40%\">".__("Enable for all feeds:")."</td>";
+ print "<td>
+ <input dojoType=\"dijit.form.CheckBox\"
+ $enable_globally_checked name=\"enable_globally\"></td></tr>";
print "</table>";
$enabled_feeds = $this->host->get($this, "enabled_feeds");
if (!array($enabled_feeds)) $enabled_feeds = array();
+ $enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
+ $this->host->set($this, "enabled_feeds", $enabled_feeds);
+
if (count($enabled_feeds) > 0) {
print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
$result = db_query("select 'similarity'::regproc");
if (db_num_rows($result) == 0) return $article;
- $enabled_feeds = $this->host->get($this, "enabled_feeds");
- $key = array_search($article["feed"]["id"], $enabled_feeds);
- if ($key === FALSE) return $article;
+ $enable_globally = $this->host->get($this, "enable_globally");
+
+ if (!$enable_globally) {
+ $enabled_feeds = $this->host->get($this, "enabled_feeds");
+ $key = array_search($article["feed"]["id"], $enabled_feeds);
+ if ($key === FALSE) return $article;
+ }
$similarity = (float) $this->host->get($this, "similarity");
if ($similarity < 0.01) return $article;
- $min_title_length = (int) $this->host->get($this, "min_length");
+ $min_title_length = (int) $this->host->get($this, "min_title_length");
if (mb_strlen($article["title"]) < $min_title_length) return $article;
$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
+
+ $result = db_query("SELECT COUNT(id) AS nequal
+ FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
+ date_entered >= NOW() - interval '1 day' AND
+ title = '$title_escaped' AND
+ guid != '$entry_guid' AND
+ owner_uid = $owner_uid");
+
+ $nequal = db_fetch_result($result, 0, "nequal");
+ _debug("af_psql_trgm: num equals: $nequal");
+
+ if ($nequal != 0) {
+ $article["force_catchup"] = true;
+ return $article;
+ }
+
$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
+ guid != '$entry_guid' AND
owner_uid = $owner_uid");
$similarity_result = db_fetch_result($result, 0, "ms");
- //_debug("similarity result: $similarity_result");
+ _debug("af_psql_trgm: similarity result: $similarity_result");
if ($similarity_result >= $similarity) {
$article["force_catchup"] = true;
return 2;
}
+ private function filter_unknown_feeds($enabled_feeds) {
+ $tmp = array();
+
+ foreach ($enabled_feeds as $feed) {
+
+ $result = db_query("SELECT id FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
+
+ if (db_num_rows($result) != 0) {
+ array_push($tmp, $feed);
+ }
+ }
+
+ return $tmp;
+ }
+
}
?>
git.wh0rd.org / tt-rss.git / blobdiff