This commit is contained in:
tomas 2005-05-26 22:45:18 +00:00
parent e1f3e0e9ca
commit c023b153b9
3 changed files with 9 additions and 11 deletions

View file

@ -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/xmlrpc/XR_LocStor.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -425,7 +425,6 @@ class XR_LocStor extends LocStor{
* The input parameters are an XML-RPC struct with the following * The input parameters are an XML-RPC struct with the following
* fields: * fields:
* <ul> * <ul>
* <li> sessid : string - session id </li>
* <li> token : string - access token * <li> token : string - access token
* returned by locstor.accessRawAudioData</li> * returned by locstor.accessRawAudioData</li>
* </ul> * </ul>
@ -453,7 +452,7 @@ class XR_LocStor extends LocStor{
{ {
list($ok, $r) = $this->_xr_getPars($input); list($ok, $r) = $this->_xr_getPars($input);
if(!$ok) return $r; if(!$ok) return $r;
$res = $this->releaseRawAudioData($r['sessid'], $r['token']); $res = $this->releaseRawAudioData(NULL, $r['token']);
if(PEAR::isError($res)){ if(PEAR::isError($res)){
return new XML_RPC_Response(0, 805, return new XML_RPC_Response(0, 805,
"xr_releaseRawAudioData: ".$res->getMessage(). "xr_releaseRawAudioData: ".$res->getMessage().
@ -957,7 +956,6 @@ class XR_LocStor extends LocStor{
* The input parameters are an XML-RPC struct with the following * The input parameters are an XML-RPC struct with the following
* fields: * fields:
* <ul> * <ul>
* <li> sessid : string - session id </li>
* <li> token : string - playlist token * <li> token : string - playlist token
* returned by locstor.accessPlaylist</li> * returned by locstor.accessPlaylist</li>
* </ul> * </ul>
@ -985,7 +983,7 @@ class XR_LocStor extends LocStor{
{ {
list($ok, $r) = $this->_xr_getPars($input); list($ok, $r) = $this->_xr_getPars($input);
if(!$ok) return $r; if(!$ok) return $r;
$res = $this->releasePlaylist($r['sessid'], $r['token']); $res = $this->releasePlaylist(NULL, $r['token']);
if(PEAR::isError($res)){ if(PEAR::isError($res)){
return new XML_RPC_Response(0, 805, return new XML_RPC_Response(0, 805,
"xr_releasePlaylist: ".$res->getMessage(). "xr_releasePlaylist: ".$res->getMessage().

View file

@ -23,7 +23,7 @@
# #
# #
# Author : $Author: tomas $ # Author : $Author: tomas $
# Version : $Revision: 1.27 $ # Version : $Revision: 1.28 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -106,7 +106,7 @@ accessRawAudioData() {
if [ $DEBUG_I ]; then echo $URL; fi if [ $DEBUG_I ]; then echo $URL; fi
if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
echo -n "# releaseRawAudioData: " echo -n "# releaseRawAudioData: "
$XR_CLI releaseRawAudioData $SESSID $TOKEN || exit $? $XR_CLI releaseRawAudioData $TOKEN || exit $?
} }
downloadRAD() { downloadRAD() {
@ -213,7 +213,7 @@ accessPlaylist() {
echo "# status: $?" echo "# status: $?"
if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
echo -n "# releasePlaylist: " echo -n "# releasePlaylist: "
$XR_CLI releasePlaylist $SESSID $TOKEN || exit $? $XR_CLI releasePlaylist $TOKEN || exit $?
} }
editPlaylist() { editPlaylist() {

View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.8 $ Version : $Revision: 1.9 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -82,7 +82,7 @@ $infos = array(
"accessRawAudioData" => array('m'=>"locstor.accessRawAudioData", "accessRawAudioData" => array('m'=>"locstor.accessRawAudioData",
'p'=>array('sessid', 'gunid'), 'r'=>array('url', 'token')), 'p'=>array('sessid', 'gunid'), 'r'=>array('url', 'token')),
"releaseRawAudioData" => array('m'=>"locstor.releaseRawAudioData", "releaseRawAudioData" => array('m'=>"locstor.releaseRawAudioData",
'p'=>array('sessid', 'token'), 'r'=>'status'), 'p'=>array('token'), 'r'=>'status'),
"downloadRawAudioDataOpen" => "downloadRawAudioDataOpen" =>
array('m'=>"locstor.downloadRawAudioDataOpen", array('m'=>"locstor.downloadRawAudioDataOpen",
'p'=>array('sessid', 'gunid'), 'r'=>array('url', 'token')), 'p'=>array('sessid', 'gunid'), 'r'=>array('url', 'token')),
@ -122,7 +122,7 @@ $infos = array(
"accessPlaylist" => array('m'=>"locstor.accessPlaylist", "accessPlaylist" => array('m'=>"locstor.accessPlaylist",
'p'=>array('sessid', 'plid'), 'r'=>array('url', 'token')), 'p'=>array('sessid', 'plid'), 'r'=>array('url', 'token')),
"releasePlaylist" => array('m'=>"locstor.releasePlaylist", "releasePlaylist" => array('m'=>"locstor.releasePlaylist",
'p'=>array('sessid', 'token'), 'r'=>'plid'), 'p'=>array('token'), 'r'=>'plid'),
"existsPlaylist" => array('m'=>"locstor.existsPlaylist", "existsPlaylist" => array('m'=>"locstor.existsPlaylist",
'p'=>array('sessid', 'plid'), 'r'=>'exists'), 'p'=>array('sessid', 'plid'), 'r'=>'exists'),
"playlistIsAvailable" => array('m'=>"locstor.playlistIsAvailable", "playlistIsAvailable" => array('m'=>"locstor.playlistIsAvailable",