Minor bug in LocStor::searchMetadata fixed.
Return struct in locstor.savePlaylist changed: single field: plid: string - playlist id
This commit is contained in:
parent
0c69b280b1
commit
85c44e8a72
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: tomas $
|
Author : $Author: tomas $
|
||||||
Version : $Revision: 1.20 $
|
Version : $Revision: 1.21 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -277,8 +277,8 @@ class LocStor extends BasicStor{
|
||||||
if($filetype=='all'){
|
if($filetype=='all'){
|
||||||
$criteriaAC = $criteria; $criteriaAC['filetype'] = 'audioclip';
|
$criteriaAC = $criteria; $criteriaAC['filetype'] = 'audioclip';
|
||||||
$criteriaPL = $criteria; $criteriaPL['filetype'] = 'playlist';
|
$criteriaPL = $criteria; $criteriaPL['filetype'] = 'playlist';
|
||||||
$resAC = $this->localSearch($criteriaAC);
|
$resAC = $this->bsLocalSearch($criteriaAC);
|
||||||
$resPL = $this->localSearch($criteriaPL);
|
$resPL = $this->bsLocalSearch($criteriaPL);
|
||||||
return array(
|
return array(
|
||||||
'audioClipResults' => $resAC['results'],
|
'audioClipResults' => $resAC['results'],
|
||||||
'playlistResults' => $resPL['results']
|
'playlistResults' => $resPL['results']
|
||||||
|
@ -501,7 +501,7 @@ class LocStor extends BasicStor{
|
||||||
* @param sessid string, session ID
|
* @param sessid string, session ID
|
||||||
* @param playlistToken string, playlist access token
|
* @param playlistToken string, playlist access token
|
||||||
* @param newPlaylist string, new playlist as XML string
|
* @param newPlaylist string, new playlist as XML string
|
||||||
* @return boolean
|
* @return string, playlistId
|
||||||
*/
|
*/
|
||||||
function savePlaylist($sessid, $playlistToken, $newPlaylist)
|
function savePlaylist($sessid, $playlistToken, $newPlaylist)
|
||||||
{
|
{
|
||||||
|
@ -511,7 +511,7 @@ class LocStor extends BasicStor{
|
||||||
$res = $ac->replaceMetaData($newPlaylist, $mdataLoc='string');
|
$res = $ac->replaceMetaData($newPlaylist, $mdataLoc='string');
|
||||||
if(PEAR::isError($res)){ return $res; }
|
if(PEAR::isError($res)){ return $res; }
|
||||||
$this->_setEditFlag($playlistId, FALSE);
|
$this->_setEditFlag($playlistId, FALSE);
|
||||||
return TRUE;
|
return $playlistId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: tomas $
|
Author : $Author: tomas $
|
||||||
Version : $Revision: 1.6 $
|
Version : $Revision: 1.7 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -709,7 +709,7 @@ class XR_LocStor extends LocStor{
|
||||||
*
|
*
|
||||||
* On success, returns a XML-RPC struct with single field:
|
* On success, returns a XML-RPC struct with single field:
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li> status : boolean - TRUE</li>
|
* <li> plid : string - playlistId</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
*
|
*
|
||||||
* On errors, returns an XML-RPC error response.
|
* On errors, returns an XML-RPC error response.
|
||||||
|
@ -738,7 +738,7 @@ class XR_LocStor extends LocStor{
|
||||||
" ".$res->getUserInfo()
|
" ".$res->getUserInfo()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return new XML_RPC_Response(XML_RPC_encode(array('status'=>$res)));
|
return new XML_RPC_Response(XML_RPC_encode(array('plid'=>$res)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue