From a781d026781a5f314090db082e72d68213b80f10 Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 21 Nov 2006 16:11:27 +0000
Subject: [PATCH] Changes for new return value of bsGetMetadataValue().  Fixes
 for function renaming.  Removed extra data copying for error checking (the
 $foo = $r = myFunc() stuff).

---
 .../modules/storageServer/var/Renderer.php    | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/campcaster/src/modules/storageServer/var/Renderer.php b/campcaster/src/modules/storageServer/var/Renderer.php
index 84736a818..f239bb761 100644
--- a/campcaster/src/modules/storageServer/var/Renderer.php
+++ b/campcaster/src/modules/storageServer/var/Renderer.php
@@ -214,37 +214,30 @@ class Renderer
         $realOgg = $r['realFname'];
         $owner = $r['owner'];
         $gunid = $r['gunid'];
-        if (PEAR::isError($r)) {
-        	return $r;
+        $parid = $gb->_getHomeDirId($owner);
+        if (PEAR::isError($parid)) {
+        	return $parid;
         }
-        $parid = $r = $gb->_getHomeDirId($owner);
-        if (PEAR::isError($r)) return $r;
         $fileName = 'rendered_playlist';
-        $id = $r = $gb->_idFromGunid($gunid);
-        if (PEAR::isError($r)) {
-        	return $r;
+        $id = $gb->idFromGunid($gunid);
+        if (PEAR::isError($id)) {
+        	return $id;
         }
         $mdata = '';
-        foreach (array(
-            'dc:title', 'dcterms:extent', 'dc:creator', 'dc:description'
-        ) as $item) {
-            $md = $r = $gb->bsGetMetadataValue($id, $item);
-            if (PEAR::isError($r)) {
-            	return $r;
-            }
-            $val = ( isset($md[0]) ? ( isset($md[0]['value']) ? $md[0]['value'] : '') : '');
+        foreach (array('dc:title', 'dcterms:extent', 'dc:creator', 'dc:description') as $item) {
+            $val = $gb->bsGetMetadataValue($id, $item);
             $mdata .= "  <$item>$val</$item>\n";
         }
         $mdata = "<audioClip>\n <metadata>\n$mdata </metadata>\n</audioClip>\n";
         //$mdata = "<audioClip>\n <metadata>\n$mdata<dcterms:extent>0</dcterms:extent>\n</metadata>\n</audioClip>\n";
-        $id = $r = $gb->bsPutFile($parid, $fileName, $realOgg, $mdata,
+        $id = $gb->bsPutFile($parid, $fileName, $realOgg, $mdata,
             NULL, 'audioclip', 'string');
-        if (PEAR::isError($r)) {
-        	return $r;
+        if (PEAR::isError($id)) {
+        	return $id;
         }
-        $ac = $r = StoredFile::recall($gb, $id);
-        if (PEAR::isError($r)) {
-        	return $r;
+        $ac = StoredFile::recall($gb, $id);
+        if (PEAR::isError($ac)) {
+        	return $ac;
         }
         return array('gunid' => $ac->gunid);
     }