From 85c44e8a729d7beed6a6fe0b7e035995fc3cf5cb Mon Sep 17 00:00:00 2001 From: tomas Date: Mon, 17 Jan 2005 22:55:01 +0000 Subject: [PATCH] Minor bug in LocStor::searchMetadata fixed. Return struct in locstor.savePlaylist changed: single field: plid: string - playlist id --- livesupport/modules/storageServer/var/LocStor.php | 10 +++++----- .../modules/storageServer/var/xmlrpc/XR_LocStor.php | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/livesupport/modules/storageServer/var/LocStor.php b/livesupport/modules/storageServer/var/LocStor.php index 4e90e3cae..ae951957f 100644 --- a/livesupport/modules/storageServer/var/LocStor.php +++ b/livesupport/modules/storageServer/var/LocStor.php @@ -23,7 +23,7 @@ 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 $ ------------------------------------------------------------------------------*/ @@ -277,8 +277,8 @@ class LocStor extends BasicStor{ if($filetype=='all'){ $criteriaAC = $criteria; $criteriaAC['filetype'] = 'audioclip'; $criteriaPL = $criteria; $criteriaPL['filetype'] = 'playlist'; - $resAC = $this->localSearch($criteriaAC); - $resPL = $this->localSearch($criteriaPL); + $resAC = $this->bsLocalSearch($criteriaAC); + $resPL = $this->bsLocalSearch($criteriaPL); return array( 'audioClipResults' => $resAC['results'], 'playlistResults' => $resPL['results'] @@ -501,7 +501,7 @@ class LocStor extends BasicStor{ * @param sessid string, session ID * @param playlistToken string, playlist access token * @param newPlaylist string, new playlist as XML string - * @return boolean + * @return string, playlistId */ function savePlaylist($sessid, $playlistToken, $newPlaylist) { @@ -511,7 +511,7 @@ class LocStor extends BasicStor{ $res = $ac->replaceMetaData($newPlaylist, $mdataLoc='string'); if(PEAR::isError($res)){ return $res; } $this->_setEditFlag($playlistId, FALSE); - return TRUE; + return $playlistId; } /** diff --git a/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php b/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php index 202d9fc1a..fa77f8f72 100644 --- a/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php +++ b/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php @@ -23,7 +23,7 @@ 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 $ ------------------------------------------------------------------------------*/ @@ -709,7 +709,7 @@ class XR_LocStor extends LocStor{ * * On success, returns a XML-RPC struct with single field: * * * On errors, returns an XML-RPC error response. @@ -738,7 +738,7 @@ class XR_LocStor extends LocStor{ " ".$res->getUserInfo() ); } - return new XML_RPC_Response(XML_RPC_encode(array('status'=>$res))); + return new XML_RPC_Response(XML_RPC_encode(array('plid'=>$res))); } /**