From 9e08f857bfbbd42df0a38dda676ede94e37a52d6 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 6 Feb 2012 11:59:20 +0100
Subject: [PATCH] CC-3174 : showbuilder

fixing merge with playlist tooltip
---
 .../controllers/LibraryController.php         | 27 +++++++++++--------
 airtime_mvc/application/models/Playlist.php   |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index ab52d2e00..9da7a257d 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -245,18 +245,23 @@ class LibraryController extends Zend_Controller_Action
         $id = $this->_getParam('id');
         $type = $this->_getParam('type');
 
-        if ($type == "audioclip") {
-            $file = Application_Model_StoredFile::Recall($id);
-            $this->view->type = $type;
-            $this->view->md = $file->getMetadata();
-        }
-        else if ($type == "playlist") {
-            $file = new Application_Model_Playlist($id);
-            $this->view->type = $type;
-            $this->view->md = $file->getAllPLMetaData();
-            $this->view->contents = $file->getContents();
-        }
+        try {
+            if ($type == "audioclip") {
+                $file = Application_Model_StoredFile::Recall($id);
+                $this->view->type = $type;
+                $this->view->md = $file->getMetadata();
+            }
+            else if ($type == "playlist") {
 
+                $file = new Application_Model_Playlist($id);
+                $this->view->type = $type;
+                $this->view->md = $file->getAllPLMetaData();
+                $this->view->contents = $file->getContents();
+            }
+        }
+        catch (Exception $e) {
+            Logging::log($e->getMessage());
+        }
     }
 
     public function uploadFileSoundcloudAction(){
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 0eefb49b3..57595ecd3 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -41,7 +41,7 @@ class Application_Model_Playlist {
 	    "dc:title" => "DbName",
     	"dc:creator" => "DbCreatorId",
     	"dc:description" => "DbDescription",
-    	"dcterms:extent" => "getDbLength"
+    	"dcterms:extent" => "DbLength"
 	);