From c023b153b90186b98434671f1a3810e6b6ab66fb Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 26 May 2005 22:45:18 +0000
Subject: [PATCH] #981

---
 .../modules/storageServer/var/xmlrpc/XR_LocStor.php       | 8 +++-----
 .../modules/storageServer/var/xmlrpc/testRunner.sh        | 6 +++---
 .../modules/storageServer/var/xmlrpc/xr_cli_test.php      | 6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php b/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php
index f07afa9e4..f7e0e41fc 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.20 $
+    Version  : $Revision: 1.21 $
     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
      *  fields:
      *  <ul>
-     *      <li> sessid  :  string  -  session id </li>
      *      <li> token   :  string  -  access token
      *              returned by locstor.accessRawAudioData</li>
      *  </ul>
@@ -453,7 +452,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        $res = $this->releaseRawAudioData($r['sessid'], $r['token']);
+        $res = $this->releaseRawAudioData(NULL, $r['token']);
         if(PEAR::isError($res)){
             return new XML_RPC_Response(0, 805,
                 "xr_releaseRawAudioData: ".$res->getMessage().
@@ -957,7 +956,6 @@ class XR_LocStor extends LocStor{
      *  The input parameters are an XML-RPC struct with the following
      *  fields:
      *  <ul>
-     *      <li> sessid  :  string  -  session id </li>
      *      <li> token   :  string  -  playlist token
      *              returned by locstor.accessPlaylist</li>
      *  </ul>
@@ -985,7 +983,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        $res = $this->releasePlaylist($r['sessid'], $r['token']);
+        $res = $this->releasePlaylist(NULL, $r['token']);
         if(PEAR::isError($res)){
             return new XML_RPC_Response(0, 805,
                 "xr_releasePlaylist: ".$res->getMessage().
diff --git a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
index dcc518150..a21e7c396 100755
--- a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
+++ b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
@@ -23,7 +23,7 @@
 #
 #
 #   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 $
 #-------------------------------------------------------------------------------
 
@@ -106,7 +106,7 @@ accessRawAudioData() {
     if [ $DEBUG_I ]; then echo $URL; fi
     if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
     echo -n "# releaseRawAudioData: "
-    $XR_CLI releaseRawAudioData $SESSID $TOKEN || exit $?
+    $XR_CLI releaseRawAudioData $TOKEN || exit $?
 }
 
 downloadRAD() {
@@ -213,7 +213,7 @@ accessPlaylist() {
     echo "#  status: $?"
     if [ $DEBUG_I ]; then echo -n "Press enter ..."; read KEY; fi
     echo -n "# releasePlaylist: "
-    $XR_CLI releasePlaylist $SESSID $TOKEN || exit $?
+    $XR_CLI releasePlaylist $TOKEN || exit $?
 }
 
 editPlaylist() {
diff --git a/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php b/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php
index 0e9ca4e1f..2b05f6427 100644
--- a/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php
+++ b/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php
@@ -23,7 +23,7 @@
  
  
     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 $
 
 ------------------------------------------------------------------------------*/
@@ -82,7 +82,7 @@ $infos = array(
     "accessRawAudioData"        => array('m'=>"locstor.accessRawAudioData",
         'p'=>array('sessid', 'gunid'), 'r'=>array('url', 'token')),
     "releaseRawAudioData"       => array('m'=>"locstor.releaseRawAudioData",
-        'p'=>array('sessid', 'token'), 'r'=>'status'),
+        'p'=>array('token'), 'r'=>'status'),
     "downloadRawAudioDataOpen"  =>
         array('m'=>"locstor.downloadRawAudioDataOpen",
             'p'=>array('sessid', 'gunid'), 'r'=>array('url', 'token')),
@@ -122,7 +122,7 @@ $infos = array(
     "accessPlaylist"    => array('m'=>"locstor.accessPlaylist",
         'p'=>array('sessid', 'plid'), 'r'=>array('url', 'token')),
     "releasePlaylist"   => array('m'=>"locstor.releasePlaylist",
-        'p'=>array('sessid', 'token'), 'r'=>'plid'),
+        'p'=>array('token'), 'r'=>'plid'),
     "existsPlaylist"    => array('m'=>"locstor.existsPlaylist",
         'p'=>array('sessid', 'plid'), 'r'=>'exists'),
     "playlistIsAvailable"   => array('m'=>"locstor.playlistIsAvailable",