Changeset 1679 for trunk/lib/class/browse.class.php

Timestamp:

08/20/08 22:22:33 (5 months ago)

Author:

vollmerk

Message:

fix filter + paging and add sort by artist and album on song browse

Files:

• trunk/lib/class/browse.class.php (modified) (9 diffs)

trunk/lib/class/browse.class.php

@@ -111 +111 @@
                 } // end switch
 
+                // If we've set a filter we need to reset the totals
+                self::reset_total(); 
+                self::set_start(0); 
+
                 return true; 
         
@@ -125 +129 @@
                 self::reset_supplemental_objects(); 
                 self::set_simple_browse(0); 
+                self::set_start(0); 
 
         } // reset
@@ -277 +282 @@
                         case 'playlist_song': 
                         case 'song': 
-                                $valid_array = array('title','year','track','time'); 
+                                $valid_array = array('title','year','track','time','album','artist'); 
                         break;
                         case 'artist': 
@@ -333 +338 @@
         public static function set_join($type,$table,$source,$dest) { 
 
-                $_SESSION['browse']['join'][self::$type] = strtoupper($type) . ' JOIN ' . $table . ' ON ' . $source . '=' . $dest; 
+                $_SESSION['browse']['join'][self::$type] = array($table=>strtoupper($type) . ' JOIN ' . $table . ' ON ' . $source . '=' . $dest); 
 
         } // set_join
@@ -565 +570 @@
          */
         private static function get_sort_sql() { 
-
+                
                 if (!is_array($_SESSION['browse']['sort'][self::$type])) { return ''; } 
 
@@ -600 +605 @@
          */
         private static function get_join_sql() { 
-
+                
                 if (!is_array($_SESSION['browse']['join'][self::$type])) { 
                         return ''; 
@@ -610 +615 @@
                         $sql .= $join . ' '; 
                 } 
-        
+
                 return $sql;    
 
@@ -816 +821 @@
                                         case 'album': 
                                                 $sql = '`album`.`name`'; 
-                                                self::set_join('left','`album`','`album`.`id`','`song`.`id`'); 
+                                                self::set_join('left','`album`','`album`.`id`','`song`.`album`'); 
+                                        break; 
+                                        case 'artist': 
+                                                $sql = '`artist`.`name`'; 
+                                                self::set_join('left','`artist`','`artist`.`id`','`song`.`artist`'); 
                                         break; 
                                         default: 
@@ -1080 +1089 @@
                         $order_sql = rtrim($order_sql,"ORDER BY ");
                         $order_sql = rtrim($order_sql,",");
-                        $sql = $sql . $order_sql;
+                        $sql = $sql . self::get_join_sql() . $order_sql;
                 } // if not simple