move counter cache to a separate class

fix references to get_article_tags

3 files changed, 4 insertions, 230 deletions

diff --git a/include/ccache.php b/include/ccache.php
deleted file mode 100644
index c6f7ddef9..000000000
--- a/include/ccache.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-	/* function ccache_zero($feed_id, $owner_uid) {
-		db_query("UPDATE ttrss_counters_cache SET
-			value = 0, updated = NOW() WHERE
-			feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
-	} */
-
-	function ccache_zero_all($owner_uid) {
-		db_query("UPDATE ttrss_counters_cache SET
-			value = 0 WHERE owner_uid = '$owner_uid'");
-
-		db_query("UPDATE ttrss_cat_counters_cache SET
-			value = 0 WHERE owner_uid = '$owner_uid'");
-	}
-
-	function ccache_remove($feed_id, $owner_uid, $is_cat = false) {
-
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
-
-		db_query("DELETE FROM $table WHERE
-			feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
-
-	}
-
-	function ccache_update_all($owner_uid) {
-
-		if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
-
-			$result = db_query("SELECT feed_id FROM ttrss_cat_counters_cache
-				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
-
-			while ($line = db_fetch_assoc($result)) {
-				ccache_update($line["feed_id"], $owner_uid, true);
-			}
-
-			/* We have to manually include category 0 */
-
-			ccache_update(0, $owner_uid, true);
-
-		} else {
-			$result = db_query("SELECT feed_id FROM ttrss_counters_cache
-				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
-
-			while ($line = db_fetch_assoc($result)) {
-				print ccache_update($line["feed_id"], $owner_uid);
-
-			}
-
-		}
-	}
-
-	function ccache_find($feed_id, $owner_uid, $is_cat = false,
-		$no_update = false) {
-
-		if (!is_numeric($feed_id)) return;
-
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-			/* if ($feed_id > 0) {
-				$tmp_result = db_query("SELECT owner_uid FROM ttrss_feeds
-					WHERE id = '$feed_id'");
-				$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
-			} */
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
-
-		if (DB_TYPE == "pgsql") {
-			$date_qpart = "updated > NOW() - INTERVAL '15 minutes'";
-		} else if (DB_TYPE == "mysql") {
-			$date_qpart = "updated > DATE_SUB(NOW(), INTERVAL 15 MINUTE)";
-		}
-
-		$result = db_query("SELECT value FROM $table
-			WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id'
-			LIMIT 1");
-
-		if (db_num_rows($result) == 1) {
-			return db_fetch_result($result, 0, "value");
-		} else {
-			if ($no_update) {
-				return -1;
-			} else {
-				return ccache_update($feed_id, $owner_uid, $is_cat);
-			}
-		}
-
-	}
-
-	function ccache_update($feed_id, $owner_uid, $is_cat = false,
-		$update_pcat = true, $pcat_fast = false) {
-
-		if (!is_numeric($feed_id)) return;
-
-		/* if (!$is_cat && $feed_id > 0) {
-			$tmp_result = db_query("SELECT owner_uid FROM ttrss_feeds
-				WHERE id = '$feed_id'");
-			$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
-		} */
-
-		$prev_unread = ccache_find($feed_id, $owner_uid, $is_cat, true);
-
-		/* When updating a label, all we need to do is recalculate feed counters
-		 * because labels are not cached */
-
-		if ($feed_id < 0) {
-			ccache_update_all($owner_uid);
-			return;
-		}
-
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
-
-		if ($is_cat && $feed_id >= 0) {
-			if ($feed_id != 0) {
-				$cat_qpart = "cat_id = '$feed_id'";
-			} else {
-				$cat_qpart = "cat_id IS NULL";
-			}
-
-			/* Recalculate counters for child feeds */
-
-			if (!$pcat_fast) {
-				$result = db_query("SELECT id FROM ttrss_feeds
-						WHERE owner_uid = '$owner_uid' AND $cat_qpart");
-
-				while ($line = db_fetch_assoc($result)) {
-					ccache_update($line["id"], $owner_uid, false, false);
-				}
-			}
-
-			$result = db_query("SELECT SUM(value) AS sv
-				FROM ttrss_counters_cache, ttrss_feeds
-				WHERE id = feed_id AND $cat_qpart AND
-				ttrss_counters_cache.owner_uid = $owner_uid AND
-				ttrss_feeds.owner_uid = '$owner_uid'");
-
-			$unread = (int) db_fetch_result($result, 0, "sv");
-
-		} else {
-			$unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
-		}
-
-		db_query("BEGIN");
-
-		$result = db_query("SELECT feed_id FROM $table
-			WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1");
-
-		if (db_num_rows($result) == 1) {
-			db_query("UPDATE $table SET
-				value = '$unread', updated = NOW() WHERE
-				feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
-
-		} else {
-			db_query("INSERT INTO $table
-				(feed_id, value, owner_uid, updated)
-				VALUES
-				($feed_id, $unread, $owner_uid, NOW())");
-		}
-
-		db_query("COMMIT");
-
-		if ($feed_id > 0 && $prev_unread != $unread) {
-
-			if (!$is_cat) {
-
-				/* Update parent category */
-
-				if ($update_pcat) {
-
-					$result = db_query("SELECT cat_id FROM ttrss_feeds
-						WHERE owner_uid = '$owner_uid' AND id = '$feed_id'");
-
-					$cat_id = (int) db_fetch_result($result, 0, "cat_id");
-
-					ccache_update($cat_id, $owner_uid, true, true, true);
-
-				}
-			}
-		} else if ($feed_id < 0) {
-			ccache_update_all($owner_uid);
-		}
-
-		return $unread;
-	}
-
-	/* function ccache_cleanup($owner_uid) {
-
-		if (DB_TYPE == "pgsql") {
-			db_query("DELETE FROM ttrss_counters_cache AS c1 WHERE
-				(SELECT count(*) FROM ttrss_counters_cache AS c2
-					WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
-					AND owner_uid = '$owner_uid'");
-
-			db_query("DELETE FROM ttrss_cat_counters_cache AS c1 WHERE
-				(SELECT count(*) FROM ttrss_cat_counters_cache AS c2
-					WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1
-					AND owner_uid = '$owner_uid'");
-		} else {
-			db_query("DELETE c1 FROM
-					ttrss_counters_cache AS c1,
-					ttrss_counters_cache AS c2
-				WHERE
-					c1.owner_uid = '$owner_uid' AND
-					c1.owner_uid = c2.owner_uid AND
-					c1.feed_id = c2.feed_id");
-
-			db_query("DELETE c1 FROM
-					ttrss_cat_counters_cache AS c1,
-					ttrss_cat_counters_cache AS c2
-				WHERE
-					c1.owner_uid = '$owner_uid' AND
-					c1.owner_uid = c2.owner_uid AND
-					c1.feed_id = c2.feed_id");
-
-		}
-	} */
-
diff --git a/include/functions.php b/include/functions.php
index 987e0c3f8..30d92d091 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -134,7 +134,6 @@
 
 	require_once 'db-prefs.php';
 	require_once 'version.php';
-	require_once 'ccache.php';
 	require_once 'labels.php';
 	require_once 'controls.php';
 
@@ -233,7 +232,7 @@
 
 		if ($purge_interval == -1 || !$purge_interval) {
 			if ($owner_uid) {
-				ccache_update($feed_id, $owner_uid);
+				CCache::update($feed_id, $owner_uid);
 			}
 			return;
 		}
@@ -277,7 +276,7 @@
 
 		$rows = db_affected_rows($result);
 
-		ccache_update($feed_id, $owner_uid);
+		CCache::update($feed_id, $owner_uid);
 
 		if ($debug) {
 			_debug("Purged feed $feed_id ($purge_interval): deleted $rows articles");
@@ -1078,7 +1077,7 @@
 		/* Special case: NULL category doesn't actually exist in the DB */
 
 		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) ccache_find(0, $_SESSION["uid"], true));
+			"counter" => (int) CCache::find(0, $_SESSION["uid"], true));
 
 		array_push($ret_arr, $cv);
 
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bb8127547..a7d30d674 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -686,7 +686,7 @@
 					$article_labels = get_article_labels($base_entry_id, $owner_uid);
 					$entry_language = db_fetch_result($result, 0, "lang");
 
-					$existing_tags = get_article_tags($base_entry_id, $owner_uid);
+					$existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
 					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
 
 				} else {