Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for new return value of bsGetMetadataValue(). Fixes for function renaming. Removed extra data copying for error checking (the $foo = $r = myFunc() stuff).

This commit is contained in:
paul 2006-11-21 16:11:27 +00:00
parent 883c6037b6
commit a781d02678
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
campcaster/src/modules/storageServer/var/Renderer.php
View File

@ -214,37 +214,30 @@ class Renderer
$realOgg = $r['realFname']; $realOgg = $r['realFname'];
$owner = $r['owner']; $owner = $r['owner'];
$gunid = $r['gunid']; $gunid = $r['gunid'];
if (PEAR::isError($r)) { $parid = $gb->_getHomeDirId($owner);
return $r; if (PEAR::isError($parid)) {
return $parid;
} }
$parid = $r = $gb->_getHomeDirId($owner);
if (PEAR::isError($r)) return $r;
$fileName = 'rendered_playlist'; $fileName = 'rendered_playlist';
$id = $r = $gb->_idFromGunid($gunid); $id = $gb->idFromGunid($gunid);
if (PEAR::isError($r)) { if (PEAR::isError($id)) {
return $r; return $id;
} }
$mdata = ''; $mdata = '';
foreach (array( foreach (array('dc:title', 'dcterms:extent', 'dc:creator', 'dc:description') as $item) {
'dc:title', 'dcterms:extent', 'dc:creator', 'dc:description' $val = $gb->bsGetMetadataValue($id, $item);
) 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'] : '') : '');
$mdata .= " <$item>$val</$item>\n"; $mdata .= " <$item>$val</$item>\n";
} }
$mdata = "<audioClip>\n <metadata>\n$mdata </metadata>\n</audioClip>\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"; //$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'); NULL, 'audioclip', 'string');
if (PEAR::isError($r)) { if (PEAR::isError($id)) {
return $r; return $id;
} }
$ac = $r = StoredFile::recall($gb, $id); $ac = StoredFile::recall($gb, $id);
if (PEAR::isError($r)) { if (PEAR::isError($ac)) {
return $r; return $ac;
} }
return array('gunid' => $ac->gunid); return array('gunid' => $ac->gunid);
} }