change short php tags to long ones

[tt-rss.git] / update_daemon.php

diff --git a/update_daemon.php b/update_daemon.php
index cf51bdd3abfe090ff28a76e438bffd7bc458fa37..5c70368200cddd8e4345eae09edd7bde5d858f8e 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -1,8 +1,10 @@
 #!/usr/bin/php4
-<?
+<?php
        // this daemon runs in the background and updates all feeds
        // continuously
 
+       define('DEFAULT_ERROR_LEVEL', E_ALL);
+
        declare(ticks = 1);
 
        define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon');
@@ -55,8 +57,8 @@
        while (true) {
 
                if (time() - $last_purge > PURGE_INTERVAL) {
-                       print "Purging old posts...\n";
-                       global_purge_old_posts($link, true);
+                       print "Purging old posts (random 30 feeds)...\n";
+                       global_purge_old_posts($link, true, 30);
                        $last_purge = time();
                }
 
@@ -71,12 +73,46 @@
        
                // Process all other feeds using last_updated and interval parameters
 
-               $result = db_query($link, "SELECT feed_url,id,owner_uid,
-                       SUBSTRING(last_updated,1,19) AS last_updated,
-                       update_interval FROM ttrss_feeds ORDER BY last_updated DESC");
+               $random_qpart = sql_random_function();
+
+/*             
+                                       ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+                       }
+
+                       $rows = pg_affected_rows($result);
+                       
+               } else {
+
+                       $result = db_query($link, "DELETE FROM ttrss_user_entries 
+                               USING ttrss_user_entries, ttrss_entries 
+                               WHERE ttrss_entries.id = ref_id AND 
+                               marked = false AND 
+                               feed_id = '$feed_id' AND 
+                               ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */                
+               
+               if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+                       if (DB_TYPE == "pgsql") {
+                               $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
+                       } else {
+                               $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
+                       }                       
+               } else {
+                       $login_thresh_qpart = "";
+               }
+
+               $result = db_query($link, "SELECT feed_url,ttrss_feeds.id,owner_uid,
+                               SUBSTRING(last_updated,1,19) AS last_updated,
+                               update_interval 
+                       FROM 
+                               ttrss_feeds,ttrss_users 
+                       WHERE 
+                               ttrss_users.id = owner_uid $login_thresh_qpart 
+                       ORDER BY $random_qpart DESC");
 
                $user_prefs_cache = array();
 
+               printf("Scheduled %d feeds to update...\n", db_num_rows($result));
+               
                while ($line = db_fetch_assoc($result)) {
        
                        $upd_intl = $line["update_interval"];
@@ -99,7 +135,7 @@
                        print "Feed: " . $line["feed_url"] . ": ";
 
                        printf("(%d/%d, %d) ", time() - strtotime($line["last_updated"]),
-                               $upd_intl*60, $owner_uid);
+                               $upd_intl*60, $user_id);
        
                        if (!$line["last_updated"] || 
                                time() - strtotime($line["last_updated"]) > ($upd_intl * 60)) {