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

solution of http://bugs.campware.org/view.php?id=523 

and minor changes
This commit is contained in:
tomas 2005-01-04 03:02:06 +00:00
parent f1ca8879ab
commit 28ab690499
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
livesupport/modules/storageServer/var/BasicStor.php
View File

@ -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/BasicStor.php,v $
------------------------------------------------------------------------------*/
@ -48,7 +48,7 @@ require_once "Transport.php";
* Core of LiveSupport file storage module
*
* @author $Author: tomas $
* @version $Revision: 1.8 $
* @version $Revision: 1.9 $
* @see Alib
*/
class BasicStor extends Alib{
@ -362,7 +362,7 @@ class BasicStor extends Alib{
$fname = "{$this->accessDir}/$token";
touch($fname); // is it needed?
$url = $this->getUrlPart()."xmlrpc/put.php?token=$token";
return array('url'=>$url, 'token'=>$token);
return array('url'=>$url, 'token'=>$token, 'gunid'=>$gunid);
}
/**
@ -667,8 +667,8 @@ class BasicStor extends Alib{
$o[] = $t2hd = $this->getObjId('test2', $this->storId);
$o[] = $this->bsCreateFolder($t2hd, 'test2_folder1');
$o[] = $this->bsPutFile($t1hd, 'file1.mp3', "$exdir/ex1.mp3", '');
$o[] = $this->bsPutFile($t1d12, 'file2.wav', "$exdir/ex2.wav", '');
$o[] = $this->bsPutFile($t1hd, 'file1.mp3', "$exdir/ex1.mp3", '', NULL, 'audioclip');
$o[] = $this->bsPutFile($t1d12, 'file2.wav', "$exdir/ex2.wav", '', NULL, 'audioclip');
/*
*/
$this->tdata['storage'] = $o;

6
livesupport/modules/storageServer/var/LocStor.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $
Version : $Revision: 1.14 $
Version : $Revision: 1.15 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $
------------------------------------------------------------------------------*/
@ -106,7 +106,7 @@ class LocStor extends GreenBox{
$ac =& StoredFile::recallByToken(&$this, $token);
if(PEAR::isError($ac)){ return $ac; }
$fname = $this->bsClosePut($token);
if(PEAR::isError($fname)){ return $fname; }
if(PEAR::isError($fname)){ $ac->delete(); return $fname; }
$res = $ac->replaceRawMediaData($fname);
if(PEAR::isError($res)){ return $res; }
if(file_exists($fname)) @unlink($fname);
@ -394,7 +394,7 @@ class LocStor extends GreenBox{
if(PEAR::isError($res)) return $res;
$res = $ac->setMime('application/smil');
if(PEAR::isError($res)) return $res;
return $playlistId;
return $ac->gunid;
}
/**

3
livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $
Version : $Revision: 1.11 $
Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php,v $
------------------------------------------------------------------------------*/
@ -233,6 +233,7 @@ class XR_LocStor extends LocStor{
* <ul>
* <li> url : string - writable URL for HTTP PUT</li>
* <li> token : string - access token</li>
* <li> gunid : string - global unique id of AudioCLip</li>
* </ul>
*
* On errors, returns an XML-RPC error response.