some incomplete work cleaning up the api a bit

2 files changed, 58 insertions, 0 deletions

diff --git a/lib/class/tag.class.php b/lib/class/tag.class.php
index ae1582f8..44d91c9b 100644
--- a/lib/class/tag.class.php
+++ b/lib/class/tag.class.php
@@ -425,6 +425,30 @@ class Tag extends database_object {
 	} // get_display
 
 	/**
+	 * count
+	 * This returns the count for the all objects assoicated with this tag
+	 * If a type is specific only counts for said type are returned
+	 */
+	public function count($type='') { 
+
+		if ($type) { 
+			$filter_sql = " AND `object_type`='" . Dba::escape($type) . "'"; 
+		} 
+
+		$results = array(); 
+
+		$sql = "SELECT COUNT(`id`) AS `count`,`object_type` FROM `tag_map` WHERE `tag_id`='" . Dba::escape($this->id) . "'" .  $filter_sql . " GROUP BY `object_type`"; 
+		$db_results = Dba::read($sql); 
+
+		while ($row = Dba::fetch_assoc($db_results)) { 
+			$results[$row['object_type']] = $row['count'];
+		} 
+
+		return $results;
+
+	} // count
+
+	/**
  	 * filter_with_prefs
 	 * This filters the tags based on the users preference
 	 */
diff --git a/lib/class/xmldata.class.php b/lib/class/xmldata.class.php
index 62267c4b..c9a11112 100644
--- a/lib/class/xmldata.class.php
+++ b/lib/class/xmldata.class.php
@@ -170,6 +170,40 @@ class xmlData {
 	} // keyed_array
 
 	/**
+	 * tags
+	 * This returns tags to the user, in a pretty xml document with the information
+	 */
+	public static function tags($tags) { 
+
+		if (count($tags) > self::$limit) { 
+			$tags = array_splice($tags,self::$offset,self::$limit); 
+		} 
+
+
+		$string = ''; 
+
+		foreach ($tags as $tag_id) { 
+			$tag = new Tag($tag_id); 
+			$counts = $tag->count(); 
+			$string .= "<tag id=\"$tag_id\">\n" . 
+					"\t<name><![CDATA[$tag->name]]></name>\n" . 
+					"\t<albums>" . intval($counts['album']) . "</albums>\n" . 
+					"\t<artists>" . intval($counts['artist']) . "</artists>\n" . 
+					"\t<songs>" . intval($counts['songs']) . "</songs>\n" . 
+					"\t<videos>" . intval($counts['video']) . "</video>\n" . 
+					"\t<playlists>" . intval($count['playlist']) . "</playlists>\n" . 
+					"\t<stream>" . intval($count['live_stream']) . "</stream>\n" . 
+					"</tag>\n"; 
+		} // end foreach 
+
+		
+		$final = self::_header() . $string . self::_footer(); 
+
+		return $final; 
+
+	} // tags
+
+	/**
 	 * artists
 	 * This takes an array of artists and then returns a pretty xml document with the information 
 	 * we want