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

#1579 createBackupCheck: faultString return field description fixed

This commit is contained in:
tomash 2006-03-24 01:15:36 +00:00
parent 23aa046283
commit c446ffc092
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
livesupport/src/modules/storageServer/var/GreenBox.php
View File

@ -676,7 +676,7 @@ class GreenBox extends BasicStor{
* with all related files * with all related files
* @return hasharray with fields: * @return hasharray with fields:
* fname string: readable fname, * fname string: readable fname,
* token string: access token * token srring: access token
*/ */
function exportPlaylistOpen($sessid, $plids, $type='lspl', $standalone=FALSE) function exportPlaylistOpen($sessid, $plids, $type='lspl', $standalone=FALSE)
{ {
@ -937,7 +937,7 @@ class GreenBox extends BasicStor{
* *
* @param sessid : string - session id * @param sessid : string - session id
* @param criteria : struct - see search criteria * @param criteria : struct - see search criteria
* @return hasharray with field: token string: backup token * @return token : string - backup token
*/ */
function createBackupOpen($sessid, $criteria='') function createBackupOpen($sessid, $criteria='')
{ {
@ -977,6 +977,7 @@ class GreenBox extends BasicStor{
* status : string - susccess | working | fault * status : string - susccess | working | fault
* tmpfile : string - filepath to result temporary file * tmpfile : string - filepath to result temporary file
* metafile : string - archive metafile in XML format * metafile : string - archive metafile in XML format
* faultString : string - error message (use only if status==fault)
*/ */
function createBackupCheck($token) function createBackupCheck($token)
{ {
@ -986,10 +987,12 @@ class GreenBox extends BasicStor{
"LocStor::createBackupCheck: invalid token ($token)" "LocStor::createBackupCheck: invalid token ($token)"
); );
} }
$status = 'success';
return array( return array(
'status'=> 'success', 'status'=> $status,
'tmpfile' => $fakeFile, 'tmpfile' => $fakeFile,
'metafile' => '', 'metafile' => '',
'faultString' => ($status==fault ? 'backup process fault' : ''),
); );
} }

5
livesupport/src/modules/storageServer/var/LocStor.php
View File

@ -974,6 +974,7 @@ class LocStor extends BasicStor{
* status : string - success | working | fault * status : string - success | working | fault
* url : string - readable url * url : string - readable url
* metafile : string - archive metafile in XML format * metafile : string - archive metafile in XML format
* faultString : string - error message (use only if status==fault)
*/ */
function createBackupCheck($token) function createBackupCheck($token)
{ {
@ -984,10 +985,12 @@ class LocStor extends BasicStor{
); );
} }
$fakeFUrl = $this->getUrlPart()."access/$token.tar"; $fakeFUrl = $this->getUrlPart()."access/$token.tar";
$status = 'success';
return array( return array(
'status'=> 'success', 'status'=> $status,
'url' => $fakeFUrl, 'url' => $fakeFUrl,
'metafile' => '', 'metafile' => '',
'faultString' => ($status==fault ? 'backup process fault' : ''),
); );
} }

14
livesupport/src/modules/storageServer/var/xmlrpc/XR_LocStor.php
View File

@ -1801,6 +1801,8 @@ class XR_LocStor extends LocStor{
* <li> status : string - success | working | fault</li> * <li> status : string - success | working | fault</li>
* <li> url : string - readable url</li> * <li> url : string - readable url</li>
* <li> metafile : string - archive metafile in XML format</li> * <li> metafile : string - archive metafile in XML format</li>
* <li> faultString : string - error message
* (use only if status==fault) </li>
* </ul> * </ul>
* *
* On errors, returns an XML-RPC error response. * On errors, returns an XML-RPC error response.
@ -1817,22 +1819,22 @@ class XR_LocStor extends LocStor{
* @return XMLRPC struct * @return XMLRPC struct
* @see LocStor::createBackupCheck * @see LocStor::createBackupCheck
*/ */
// <li> 854 - backup process fault</li>
function xr_createBackupCheck($input) function xr_createBackupCheck($input)
{ {
list($ok, $r) = $this->_xr_getPars($input); list($ok, $r) = $this->_xr_getPars($input);
if(!$ok) return $r; if(!$ok) return $r;
$res = $this->createBackupCheck($r['token']); $res = $this->createBackupCheck($r['token']);
if(PEAR::isError($res)){ if(PEAR::isError($res)){
return new XML_RPC_Response(0, 805, $ec0 = intval($res->getCode());
$ec = ($ec0 == GBERR_BGERR ? 800+$ec0 : 805 );
return new XML_RPC_Response(0, $ec,
"xr_createBackupCheck: ".$res->getMessage(). "xr_createBackupCheck: ".$res->getMessage().
" ".$res->getUserInfo() " ".$res->getUserInfo()
); );
} }
return new XML_RPC_Response(XML_RPC_encode(array( return new XML_RPC_Response(XML_RPC_encode($res));
'url'=>$res['url'],
'status'=>$res['status'],
'metafile'=>$res['metafile'],
)));
} }
/** /**