fix broken article update functionality

diff --git a/backend.php b/backend.php
index 88fcdc6bc7141dcb89c715e0e4e3b8b82ab15682..730d17935b0e76feb68f2675f0c7a083118e3e98 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -597,7 +597,7 @@
 //                             strtotime($line["updated"]), $line["updated"],
 //                             strtotime($line["last_read"]) >= strtotime($line["updated"]));
 
-                       if ($line["last_read"] != "" && $line["updated"] != "" &&
+/*                     if ($line["last_read"] != "" && $line["updated"] != "" &&
                                strtotime($line["last_read_noms"]) < strtotime($line["updated_noms"])) {
 
                                $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
@@ -608,6 +608,14 @@
                                $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
                                        alt=\"Updated\">";
 
+                       } */
+
+                       if ($line["last_read"] == "") {
+                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\" 
+                                       alt=\"Updated\">";
+                       } else {
+                               $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\" 
+                                       alt=\"Updated\">";
                        }
 
                        if ($line["unread"] == "t" || $line["unread"] == "1") {

diff --git a/functions.php b/functions.php
index a2e29655b8a84b94ad613465b723a66a74107e6b..888b0e6e8a9632c83c5832acfc2031101097e2f8 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -189,14 +189,10 @@
 
                                $entry_guid = db_escape_string($entry_guid);
 
-                               if (DB_TYPE == "pgsql") {
-                                       $extract_ts_qpart = ",EXTRACT(EPOCH FROM updated) as updated_timestamp";
-                               }
-
                                $result = db_query($link, "
                                        SELECT 
-                                               id,last_read,no_orig_date,title,feed_id,content_hash
-                                               $extract_ts_qpart
+                                               id,last_read,no_orig_date,title,feed_id,content_hash,
+                                               substring(updated,1,19) as updated
                                        FROM
                                                ttrss_entries 
                                        WHERE
@@ -249,14 +245,17 @@
                                        $orig_entry_id = db_fetch_result($result, 0, "id");                     
                                        $orig_feed_id = db_fetch_result($result, 0, "feed_id");
 
+//                                     print "OED: $orig_entry_id; OID: $orig_feed_id ; FID: $feed<br>";
+
                                        if ($orig_feed_id != $feed) {
-//                                             print "<p>Update from different feed ($orig_feed_id, $feed): $entry_guid [$entry_title]";
+//                                             print "<p>GUID $entry_guid: update from different feed ($orig_feed_id, $feed): $entry_guid [$entry_title]";
                                                continue;
                                        }
 
                                        $entry_is_modified = false;
                                        
-                                       $orig_timestamp = db_fetch_result($result, 0, "updated_timestamp");
+                                       $orig_timestamp = strtotime(db_fetch_result($result, 0, "updated"));
+                                               
                                        $orig_content_hash = db_fetch_result($result, 0, "content_hash");
                                        $orig_last_read = db_fetch_result($result, 0, "last_read");     
                                        $orig_no_orig_date = db_fetch_result($result, 0, "no_orig_date");
@@ -265,6 +264,8 @@
                                        $last_read_qpart = "";
 
                                        if ($orig_content_hash != $content_hash) {
+//                                             print "$orig_content_hash :: $content_hash<br>";
+
                                                if (UPDATE_POST_ON_CHECKSUM_CHANGE) {
                                                        $last_read_qpart = 'last_read = null,';
                                                }
@@ -281,6 +282,8 @@
 
                                        if ($entry_is_modified) {
 
+//                                             print "$entry_guid Modified!<br>";
+
                                                $entry_comments = db_escape_string($entry_comments);
                                                $entry_content = db_escape_string($entry_content);
                                                $entry_title = db_escape_string($entry_title);