Changeset 1698

Timestamp:

08/26/08 09:02:11 (3 months ago)

Author:

vollmerk

Message:

fixed two sql queries and the slicing on search (Thx sylvander)

Location:

trunk

Files:

• docs/CHANGELOG (modified) (1 diff)
• lib/class/artist.class.php (modified) (2 diffs)
• lib/class/browse.class.php (modified) (1 diff)

trunk/docs/CHANGELOG

@@ -5 +5 @@
 --------------------------------------------------------------------------
   v.3.5-Alpha1
+        - Fixed count issue on browse Artists (Thx Sylvander)
         - Fixed prevent_multiple_logins, preventing all logins (Thx hugh)
         - Fixed Export catalog headers so it corretly prompts you to download

trunk/lib/class/artist.class.php

@@ -90 +90 @@
                 // If we need to also pull the extra information, this is normally only used when we are doing the human display
                 if ($extra) { 
-                        $sql = "SELECT `song`.`artist`, COUNT(`song`.`id`) AS `song_count`, COUNT(`song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` " .
+                        $sql = "SELECT `song`.`artist`, COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` " .
                                 "WHERE `song`.`artist` IN $idlist GROUP BY `song`.`artist`";
                         $db_results = Dba::query($sql);
@@ -189 +189 @@
                 else { 
                         $uid = Dba::escape($this->id); 
-                        $sql = "SELECT `song`.`artist`,COUNT(`song`.`id`) AS `song_count`, COUNT(`song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` " . 
+                        $sql = "SELECT `song`.`artist`,COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` " . 
                                 "WHERE `song`.`artist`='$uid' GROUP BY `song`.`artist`";
                         $db_results = Dba::query($sql);

trunk/lib/class/browse.class.php

@@ -946 +946 @@
                 // Limit is based on the users preferences if this is not a simple browse because we've got too much here
                 if (count($object_ids) > self::$start AND !self::is_simple_browse()) { 
-                        $object_ids = array_slice($object_ids,self::$start,$limit); 
+                        $object_ids = array_slice($object_ids,self::$start,self::$offset); 
                 }