summaryrefslogtreecommitdiffstats
path: root/lib/search.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-08-08 05:41:02 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-08-08 05:41:02 +0000
commit68a6acbd0521c93dac7be7bb8b598b5b53498bb9 (patch)
treea3494271a19a487edee56599fdf875c296aedf42 /lib/search.php
parentca95e29152dec5ab7402911da20e197f822ce8ee (diff)
downloadampache-68a6acbd0521c93dac7be7bb8b598b5b53498bb9.tar.gz
ampache-68a6acbd0521c93dac7be7bb8b598b5b53498bb9.tar.bz2
ampache-68a6acbd0521c93dac7be7bb8b598b5b53498bb9.zip
remove the genre references from search so it works again
Diffstat (limited to 'lib/search.php')
-rw-r--r--lib/search.php10
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/search.php b/lib/search.php
index b5d300a0..2804c794 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -72,7 +72,6 @@ function run_search($data) {
switch($_REQUEST['object_type']) {
case 'artist':
case 'album':
- case 'genre':
case 'song':
$function_name = 'search_' . $_REQUEST['object_type'];
if (function_exists($function_name)) {
@@ -130,7 +129,6 @@ function search_song($data,$operator,$method,$limit) {
song.title LIKE '%$word%' OR
album2.name LIKE '%$word%' OR
artist2.name LIKE '%$word%' OR
- genre2.name LIKE '%$word%' OR
song.year LIKE '%$word%' OR
song.file LIKE '%$word%'
) ";
@@ -138,7 +136,6 @@ function search_song($data,$operator,$method,$limit) {
$where_sql .= " ) $operator";
$table_sql .= " LEFT JOIN `album` as `album2` ON `song`.`album`=`album2`.`id`";
$table_sql .= " LEFT JOIN `artist` as `artist2` ON `song`.`artist`=`artist2`.`id`";
- $table_sql .= " LEFT JOIN `genre` as `genre2` ON `song`.`genre`=`genre2`.`id`";
break;
case 'title':
$where_sql .= " song.title $value_string $operator";
@@ -151,10 +148,6 @@ function search_song($data,$operator,$method,$limit) {
$where_sql .= " artist.name $value_string $operator";
$table_sql .= " LEFT JOIN `artist` ON `song`.`artist`=`artist`.`id` ";
break;
- case 'genre':
- $where_sql .= " genre.name $value_string $operator";
- $table_sql .= " LEFT JOIN `genre` ON `song`.`genre`=`genre`.`id`";
- break;
case 'year':
if (empty($data["year2"]) && is_numeric($data["year"])) {
$where_sql .= " song.year $value_string $operator";
@@ -252,9 +245,6 @@ function show_search($type,$results) {
case 'album':
break;
- case 'genre':
-
- break;
case 'song':
default:
show_songs($results,0);