update_rss_feed: properly define

[tt-rss.git] / update_daemon_loop.php

diff --git a/update_daemon_loop.php b/update_daemon_loop.php
old mode 100644 (file)
new mode 100755 (executable)
index 737194a..7fa22d1
--- a/update_daemon_loop.php
+++ b/update_daemon_loop.php
@@ -12,8 +12,6 @@
 
        declare(ticks = 1);
 
-       define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon');
-       define('SIMPLEPIE_CACHE_DIR',   '/var/tmp/simplepie-ttrss-cache-daemon');
        define('DISABLE_SESSIONS', true);
 
        require_once "version.php";
@@ -34,7 +32,7 @@
        require_once "db.php";
        require_once "db-prefs.php";
        require_once "functions.php";
-       require_once "magpierss/rss_fetch.inc";
+       require_once "lib/magpierss/rss_fetch.inc";
 
        error_reporting(DEFAULT_ERROR_LEVEL);
 
@@ -54,15 +52,7 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
-               pg_set_client_encoding("UNICODE");
-       } else {
-               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
-//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
-               }
-       }
+       init_connection($link);
 
        $last_purge = 0;
 
@@ -71,42 +61,15 @@
                die;
        }
 
-       if (time() - $last_purge > PURGE_INTERVAL) {
-               _debug("Purging old posts (random 30 feeds)...");
-               global_purge_old_posts($link, true, 30);
-               $last_purge = time();
-       }
-
-       // FIXME: get all scheduled updates w/forced refetch
-       // Stub, until I figure out if it is really needed.
-
-#              $result = db_query($link, "SELECT * FROM ttrss_scheduled_updates ORDER BY id");
-#              while ($line = db_fetch_assoc($result)) {
-#                      print "Scheduled feed update: " . $line["feed_id"] . ", UID: " . 
-#                              $line["owner_uid"] . "\n";
-#              }
-
-       // Process all other feeds using last_updated and interval parameters
+       // Call to the feed batch update function 
+       // or regenerate feedbrowser cache
 
-//     $random_qpart = sql_random_function();
-
-/*             
-                               ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
-               }
-
-               $rows = pg_affected_rows($result);
-               
+       if (rand(0,100) > 50) {
+               update_daemon_common($link);
        } 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)"); */                
-
-       // Call to the feed batch update function
-       update_daemon_common($link);
+               $count = update_feedbrowser_cache($link);
+               _debug("Finished, $count feeds processed.");
+       }
 
        db_close($link);