diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-06 06:05:32 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-06 06:05:32 +0000 |
| commit | b3dcd437cb507774753659faa113d499e107e201 (patch) | |
| tree | faaaf999315b575f063c0564ea4d6d5aebb9ea5e /lib | |
| parent | f7cfd87117fbd41911bb6823aec8ea3ffdd72350 (diff) | |
| download | ampache-b3dcd437cb507774753659faa113d499e107e201.tar.gz ampache-b3dcd437cb507774753659faa113d499e107e201.tar.bz2 ampache-b3dcd437cb507774753659faa113d499e107e201.zip | |
fixed lack of prefix on albums improves album art search results, thx darkside
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/album.class.php | 10 | ||||
| -rw-r--r-- | lib/class/catalog.class.php | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php index bbacf852..d0beedce 100644 --- a/lib/class/album.class.php +++ b/lib/class/album.class.php @@ -209,9 +209,9 @@ class Album { foreach ($data as $key=>$value) { $this->$key = $value; } /* Truncate the string if it's to long */ - $this->f_name = truncate_with_ellipsis($this->name,Config::get('ellipsis_threshold_album')); + $this->f_name = truncate_with_ellipsis($this->full_name,Config::get('ellipsis_threshold_album')); - $this->f_name_link = "<a href=\"$web_path/albums.php?action=show&album=" . scrub_out($this->id) . "\" title=\"" . scrub_out($this->name) . "\">" . $this->f_name; + $this->f_name_link = "<a href=\"$web_path/albums.php?action=show&album=" . scrub_out($this->id) . "\" title=\"" . scrub_out($this->full_name) . "\">" . $this->f_name; // If we've got a disk append it if ($this->disk) { $this->f_name_link .= " <span class=\"discnb disc" .$this->disk. "\">[" . _('Disk') . " " . $this->disk . "]</span>"; @@ -219,7 +219,7 @@ class Album { $this->f_name_link .="</a>"; $this->f_link = $this->f_name_link; - $this->f_title = $name; + $this->f_title = $full_name; if ($this->artist_count == '1') { $artist = scrub_out(truncate_with_ellipsis(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipsis_threshold_album'))); $this->f_artist_link = "<a href=\"$web_path/artists.php?action=show&artist=" . $this->artist_id . "\">" . $artist . "</a>"; @@ -334,7 +334,7 @@ class Album { } else { $artist = $this->artist_name; - $album = $this->name; + $album = $this->full_name; } $raw_data = $lastfm->search($artist,$album); @@ -533,7 +533,7 @@ class Album { set_time_limit(0); if (empty($keywords)) { - $keywords = $this->name; + $keywords = $this->full_name; /* If this isn't a various album combine with artist name */ if ($this->artist_count == '1') { $keywords .= ' ' . $this->artist; } } diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index e7942444..cfab9321 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -615,9 +615,9 @@ class Catalog { // Define the options we want to use for the find art function $options = array( - 'album_name' => $album->name, + 'album_name' => $album->full_name, 'artist' => $album->artist_name, - 'keyword' => $album->artist_name . ' ' . $album->name + 'keyword' => $album->artist_name . ' ' . $album->full_name ); // Return results @@ -2236,6 +2236,9 @@ class Catalog { $sql = "DELETE FROM `song` WHERE `catalog` = '$catalog_id'"; $db_results = Dba::query($sql); + // Only if the previous one works do we go on + if (!$db_results) { return false; } + // Next Remove the Catalog Entry it's self $sql = "DELETE FROM `catalog` WHERE `id` = '$catalog_id'"; $db_results = Dba::query($sql); |