X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=2fa2e2f54b0ea7f3ff7a98de5394ebcee0442813;hb=5f0a3741d0a549849b503eca7b6d7b87d9903069;hp=50b9fc412e950fe65942d35714d04f6e51e7d9ed;hpb=661135c742cc31bc0eece3bb669dad707d0aff66;p=tt-rss.git

diff --git a/update.php b/update.php
index 50b9fc41..2fa2e2f5 100755
--- a/update.php
+++ b/update.php
@@ -1,18 +1,19 @@
 #!/usr/bin/php
 <?php
-	define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
-	define('DISABLE_SESSIONS', true);
+	set_include_path(get_include_path() . PATH_SEPARATOR . "include");
 
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
+	define('DISABLE_SESSIONS', true);
 
-	error_reporting(DEFAULT_ERROR_LEVEL);
+	chdir(dirname(__FILE__));
 
+	require_once "functions.php";
 	require_once "sanity_check.php";
 	require_once "config.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
-	require_once "functions.php";
+
+	if (!defined('PHP_EXECUTABLE'))
+		define('PHP_EXECUTABLE', '/usr/bin/php');
 
 	$op = $argv[1];
 
@@ -22,6 +23,8 @@
 		print "  -feeds         - update feeds\n";
 		print "  -feedbrowser   - update feedbrowser\n";
 		print "  -daemon        - start single-process update daemon\n";
+		print "  -cleanup-tags  - perform tags table maintenance\n";
+		print "  -get-feeds     - receive popular feeds from linked instances\n";
 		print "  -help          - show this help\n";
 		return;
 	}
@@ -42,21 +45,25 @@
 	}
 
 	// Create a database connection.
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);	
-
-	if (!$link) {
-		if (DB_TYPE == "mysql") {
-			print mysql_error();
-		}
-		// PG seems to display its own errors just fine by default.		
-		return;
-	}
+	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
 	init_connection($link);
 
 	if ($op == "-feeds") {
 		// Update all feeds needing a update.
 		update_daemon_common($link);
+
+		// Update feedbrowser
+		$count = update_feedbrowser_cache($link);
+		_debug("Feedbrowser updated, $count feeds processed.");
+
+		// Purge orphans and cleanup tags
+		purge_orphans($link, true);
+
+		$rc = cleanup_tags($link, 14, 50000);
+		_debug("Cleaned $rc cached tags.");
+
+		get_linked_feeds($link);
 	}
 
 	if ($op == "-feedbrowser") {
@@ -65,9 +72,6 @@
 	}
 
 	if ($op == "-daemon") {
-		if (!ENABLE_UPDATE_DAEMON)
-			die("Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
-
 		while (true) {
 			passthru(PHP_EXECUTABLE . " " . $argv[0] . " -daemon-loop");
 			_debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
@@ -80,19 +84,40 @@
 			die("error: unable to create stampfile\n");
 		}
 
-		// Call to the feed batch update function 
+		// Call to the feed batch update function
 		// or regenerate feedbrowser cache
 
 		if (rand(0,100) > 30) {
 			update_daemon_common($link);
 		} else {
 			$count = update_feedbrowser_cache($link);
-			_debug("Finished, $count feeds processed.");
+			_debug("Feedbrowser updated, $count feeds processed.");
+
+			purge_orphans($link, true);
+
+			$rc = cleanup_tags($link, 14, 50000);
+
+			_debug("Cleaned $rc cached tags.");
+
+			get_linked_feeds($link);
 		}
 
 	}
 
+	if ($op == "-cleanup-tags") {
+		$rc = cleanup_tags($link, 14, 50000);
+		print "$rc tags deleted.\n";
+	}
+
+	if ($op == "-get-feeds") {
+		get_linked_feeds($link);
+	}
+
 	db_close($link);
 
+	if ($lock_handle != false) {
+		fclose($lock_handle);
+	}
+
 	unlink(LOCK_DIRECTORY . "/$lock_filename");
 ?>